annotate src/window.c @ 99191:e295f1ce302e

*** empty log message ***
author Martin Rudalics <rudalics@gmx.at>
date Tue, 28 Oct 2008 17:57:09 +0000
parents dc2662d377a4
children ce3730476c2a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Window creation, deletion and examination for GNU Emacs.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2 Does not include redisplay.
61511
db63a29e7669 (Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61444
diff changeset
3 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
79759
fc2bcd2a8aad Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79234
diff changeset
4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
fc2bcd2a8aad Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79234
diff changeset
5 Free Software Foundation, Inc.
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 This file is part of GNU Emacs.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU Emacs is distributed in the hope that it will be useful,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 GNU General Public License for more details.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include "lisp.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
29 #include "frame.h"
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "window.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "commands.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "indent.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "termchar.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
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
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 /* This is the window in which the terminal's cursor should
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 be left when nothing is being done with it. This must
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 always be a leaf window, and its buffer is selected by
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 the top level editing loop at the end of each command.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 This value is always the same as
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
94 FRAME_SELECTED_WINDOW (selected_frame). */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 Lisp_Object selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 the selected window. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
108
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 Lisp_Object minibuf_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 Lisp_Object Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
123 Lisp_Object Vother_window_scroll_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 Lisp_Object Vtemp_buffer_show_function;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 /* Incremented for each window created. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
153
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 static int sequence_number;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
49b5dabf0ccc Fix commentary.
Kim F. Storm <storm@cua.dk>
parents: 57898
diff changeset
165 /* Non-nil means scroll commands try to put point
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
166 at the same screen height as previously. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
167
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
168 Lisp_Object Vscroll_preserve_screen_position;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
169
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
170 /* Non-nil means that text is inserted before window's markers. */
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
171
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
172 Lisp_Object Vwindow_point_insertion_type;
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
173
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
174 /* Incremented by 1 whenever a window is deleted. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
175
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
176 int window_deletion_count;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
177
69342
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
178 /* Used by the function window_scroll_pixel_based */
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
179
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
180 static int window_scroll_pixel_based_preserve_x;
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
181 static int window_scroll_pixel_based_preserve_y;
69342
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
182
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
183 /* Same for window_scroll_line_based. */
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
184
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
185 static int window_scroll_preserve_hpos;
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
186 static int window_scroll_preserve_vpos;
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
187
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
188 #if 0 /* This isn't used anywhere. */
17962
8621a73a8890 (syms_of_window): Initialize inhibit_frame_unsplittable.
Richard M. Stallman <rms@gnu.org>
parents: 17955
diff changeset
189 /* Nonzero means we can split a frame even if it is "unsplittable". */
17955
3140e48262f9 frame-override-unsplittable/inhibit-frame-unsplittable name change.
Simon Marshall <simon@gnu.org>
parents: 17952
diff changeset
190 static int inhibit_frame_unsplittable;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
191 #endif /* 0 */
17540
eb82c4de9dea (frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17365
diff changeset
192
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
193 extern EMACS_INT scroll_margin;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
194
14149
0d67df27dc2a (Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents: 14089
diff changeset
195 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 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
198 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
199 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
200 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
202 return WINDOWP (object) ? Qt : Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
205 DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0,
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 which is currently visible. */)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
207 (object)
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
208 Lisp_Object object;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
209 {
35398
ef34ddc12a7d * window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 35396
diff changeset
210 return WINDOW_LIVE_P (object) ? Qt : Qnil;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
211 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
212
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 Lisp_Object
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 make_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
216 Lisp_Object val;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 register struct window *p;
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
218
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
219 p = allocate_window ();
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
220 ++sequence_number;
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
221 XSETFASTINT (p->sequence_number, sequence_number);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
222 XSETFASTINT (p->left_col, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
223 XSETFASTINT (p->top_line, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
224 XSETFASTINT (p->total_lines, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
225 XSETFASTINT (p->total_cols, 0);
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
226 XSETFASTINT (p->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
227 XSETFASTINT (p->min_hscroll, 0);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
228 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 p->start = Fmake_marker ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 p->pointm = Fmake_marker ();
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
231 XSETFASTINT (p->use_time, 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
232 p->frame = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 p->display_table = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 p->dedicated = Qnil;
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
235 p->window_parameters = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
236 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
237 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
238 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
239 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
240 p->desired_matrix = p->current_matrix = 0;
56497
8f77d7fac4d6 (make_window): Initialize nrows_scale_factor and
Kim F. Storm <storm@cua.dk>
parents: 56487
diff changeset
241 p->nrows_scale_factor = p->ncols_scale_factor = 1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
242 p->phys_cursor_type = -1;
43620
8a5d6239662c (make_window, replace_window): Initialize phys_cursor_width.
Kim F. Storm <storm@cua.dk>
parents: 43597
diff changeset
243 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
244 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
245 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
246 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
247 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
248 p->vscroll = 0;
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
249 XSETWINDOW (val, p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
250 XSETFASTINT (p->last_point, 0);
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
251 p->frozen_window_start_p = 0;
44744
8c52c2bf3b3f (make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents: 44649
diff changeset
252 p->last_cursor_off_p = p->cursor_off_p = 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
253 p->left_margin_cols = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
254 p->right_margin_cols = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
255 p->left_fringe_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
256 p->right_fringe_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
257 p->fringes_outside_margins = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
258 p->scroll_bar_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
259 p->vertical_scroll_bar_type = Qt;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
260 p->resize_proportionally = Qnil;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
261
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
262 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 return val;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
267 doc: /* Return the window that the cursor now appears in and commands apply to. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
268 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 return selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
273 DEFUN ("minibuffer-window", Fminibuffer_window, Sminibuffer_window, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
274 doc: /* Return the window used now for minibuffers.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
275 If the optional argument FRAME is specified, return the minibuffer window
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
276 used by that frame. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
277 (frame)
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
278 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 {
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
280 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
281 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
282 CHECK_LIVE_FRAME (frame);
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
283 return FRAME_MINIBUF_WINDOW (XFRAME (frame));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
286 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0,
99189
dc2662d377a4 * window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents: 99160
diff changeset
287 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
288 WINDOW defaults to the selected window. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
289 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 struct window *w = decode_window (window);
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
293 return MINI_WINDOW_P (w) ? Qt : Qnil;
32710
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
294 }
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
295
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
296
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297 DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
298 Spos_visible_in_window_p, 0, 3, 0,
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
299 doc: /* Return non-nil if position POS is currently on the frame in WINDOW.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
300 Return nil if that position is scrolled vertically out of view.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
301 If a character is only partially visible, nil is returned, unless the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
302 optional argument PARTIALLY is non-nil.
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
303 If POS is only out of view because of horizontal scrolling, return non-nil.
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
304 If POS is t, it specifies the position of the last visible glyph in WINDOW.
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
305 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
306
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
307 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
308 return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
309 where X and Y are the pixel coordinates relative to the top left corner
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
310 of the window. The remaining elements are omitted if the character after
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
311 POS is fully visible; otherwise, RTOP and RBOT are the number of pixels
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
312 off-window at the top and bottom of the row, ROWH is the height of the
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
313 display row, and VPOS is the row number (0-based) containing POS. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
314 (pos, window, partially)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
315 Lisp_Object pos, window, partially;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 register int posint;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319 register struct buffer *buf;
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
320 struct text_pos top;
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
321 Lisp_Object in_window = Qnil;
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
322 int rtop, rbot, rowh, vpos, fully_p = 1;
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
323 int x, y;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
325 w = decode_window (window);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
326 buf = XBUFFER (w->buffer);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
327 SET_TEXT_POS_FROM_MARKER (top, w->start);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
328
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
329 if (EQ (pos, Qt))
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
330 posint = -1;
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
331 else if (!NILP (pos))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
332 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
333 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 posint = XINT (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 }
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
336 else if (w == XWINDOW (selected_window))
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
337 posint = PT;
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
338 else
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
339 posint = XMARKER (w->pointm)->charpos;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
340
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
341 /* If position is above window start or outside buffer boundaries,
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
342 or if window start is out of range, position is not visible. */
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
343 if ((EQ (pos, Qt)
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
344 || (posint >= CHARPOS (top) && posint <= BUF_ZV (buf)))
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
345 && CHARPOS (top) >= BUF_BEGV (buf)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
346 && CHARPOS (top) <= BUF_ZV (buf)
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
347 && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, &rowh, &vpos)
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
348 && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p)))
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
349 in_window = Qt;
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
350
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
351 if (!NILP (in_window) && !NILP (partially))
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
352 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
353 Lisp_Object part = Qnil;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
354 if (!fully_p)
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
355 part = list4 (make_number (rtop), make_number (rbot),
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
356 make_number (rowh), make_number (vpos));
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
357 in_window = Fcons (make_number (x),
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
358 Fcons (make_number (y), part));
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
359 }
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
360
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
361 return in_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 }
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
363
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
364 DEFUN ("window-line-height", Fwindow_line_height,
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
365 Swindow_line_height, 0, 2, 0,
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
366 doc: /* Return height in pixels of text line LINE in window WINDOW.
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
367 If WINDOW is nil or omitted, use selected window.
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
368
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
369 Return height of current line if LINE is omitted or nil. Return height of
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
370 header or mode line if LINE is `header-line' and `mode-line'.
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
371 Otherwise, LINE is a text line number starting from 0. A negative number
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
372 counts from the end of the window.
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
373
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
374 Value is a list (HEIGHT VPOS YPOS OFFBOT), where HEIGHT is the height
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
375 in pixels of the visible part of the line, VPOS and YPOS are the
73018
aab836d32a11 (Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 73013
diff changeset
376 vertical position in lines and pixels of the line, relative to the top
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
377 of the first text line, and OFFBOT is the number of off-window pixels at
73018
aab836d32a11 (Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 73013
diff changeset
378 the bottom of the text line. If there are off-window pixels at the top
aab836d32a11 (Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 73013
diff changeset
379 of the (first) text line, YPOS is negative.
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
380
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
381 Return nil if window display is not up-to-date. In that case, use
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
382 `pos-visible-in-window-p' to obtain the information. */)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
383 (line, window)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
384 Lisp_Object line, window;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
385 {
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
386 register struct window *w;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
387 register struct buffer *b;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
388 struct glyph_row *row, *end_row;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
389 int max_y, crop, i, n;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
390
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
391 w = decode_window (window);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
392
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
393 if (noninteractive
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
394 || w->pseudo_window_p)
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
395 return Qnil;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
396
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
397 CHECK_BUFFER (w->buffer);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
398 b = XBUFFER (w->buffer);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
399
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
400 /* Fail if current matrix is not up-to-date. */
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
401 if (NILP (w->window_end_valid)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
402 || current_buffer->clip_changed
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
403 || current_buffer->prevent_redisplay_optimizations_p
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
404 || XFASTINT (w->last_modified) < BUF_MODIFF (b)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
405 || XFASTINT (w->last_overlay_modified) < BUF_OVERLAY_MODIFF (b))
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
406 return Qnil;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
407
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
408 if (NILP (line))
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
409 {
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
410 i = w->cursor.vpos;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
411 if (i < 0 || i >= w->current_matrix->nrows
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
412 || (row = MATRIX_ROW (w->current_matrix, i), !row->enabled_p))
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
413 return Qnil;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
414 max_y = window_text_bottom_y (w);
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
415 goto found_row;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
416 }
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
417
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
418 if (EQ (line, Qheader_line))
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
419 {
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
420 if (!WINDOW_WANTS_HEADER_LINE_P (w))
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
421 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
422 row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
423 if (!row->enabled_p)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
424 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
425 return list4 (make_number (row->height),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
426 make_number (0), make_number (0),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
427 make_number (0));
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
428 }
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
429
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
430 if (EQ (line, Qmode_line))
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
431 {
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
432 row = MATRIX_MODE_LINE_ROW (w->current_matrix);
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
433 if (!row->enabled_p)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
434 return Qnil;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
435 return list4 (make_number (row->height),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
436 make_number (0), /* not accurate */
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
437 make_number (WINDOW_HEADER_LINE_HEIGHT (w)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
438 + window_text_bottom_y (w)),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
439 make_number (0));
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
440 }
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
441
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
442 CHECK_NUMBER (line);
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
443 n = XINT (line);
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
444
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
445 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
446 end_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
447 max_y = window_text_bottom_y (w);
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
448 i = 0;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
449
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
450 while ((n < 0 || i < n)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
451 && row <= end_row && row->enabled_p
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
452 && row->y + row->height < max_y)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
453 row++, i++;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
454
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
455 if (row > end_row || !row->enabled_p)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
456 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
457
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
458 if (++n < 0)
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
459 {
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
460 if (-n > i)
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
461 return Qnil;
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
462 row += n;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
463 i += n;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
464 }
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
465
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
466 found_row:
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
467 crop = max (0, (row->y + row->height) - max_y);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
468 return list4 (make_number (row->height + min (0, row->y) - crop),
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
469 make_number (i),
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
470 make_number (row->y),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
471 make_number (crop));
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
472 }
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
473
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
474
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
476 static struct window *
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
477 decode_window (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
480 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
481 return XWINDOW (selected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
483 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 return XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
487 static struct window *
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
488 decode_any_window (window)
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
489 register Lisp_Object window;
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
490 {
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
491 if (NILP (window))
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
492 return XWINDOW (selected_window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
493
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
494 CHECK_WINDOW (window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
495 return XWINDOW (window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
496 }
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
497
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
56393
8eb84bf840a8 (Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56174
diff changeset
499 doc: /* Return the buffer that WINDOW is displaying.
8eb84bf840a8 (Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56174
diff changeset
500 WINDOW defaults to the selected window. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
501 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
503 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 return decode_window (window)->buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0,
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
508 doc: /* Return the number of lines in WINDOW (including its mode line).
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
509 WINDOW defaults to the selected window. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
510 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
513 return decode_any_window (window)->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
515
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
516 DEFUN ("window-width", Fwindow_width, Swindow_width, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
517 doc: /* Return the number of display columns in WINDOW.
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
518 WINDOW defaults to the selected window.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
519
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
520 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
521 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
522 (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
523 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
526 return make_number (window_box_text_cols (decode_any_window (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
529 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
530 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
531 WINDOW defaults to the selected window. */)
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
532 (window)
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
533 Lisp_Object window;
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
534 {
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
535 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
536 }
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
537
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538 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
539 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
540 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
541 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
543 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 return decode_window (window)->hscroll;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 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
548 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
549 Return NCOL. NCOL should be zero or positive.
45645
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
550
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
551 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
552 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
553 (window, ncol)
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
554 Lisp_Object window, ncol;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 {
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
556 struct window *w = decode_window (window);
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
557 int hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
559 CHECK_NUMBER (ncol);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
560 hscroll = max (0, XINT (ncol));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
561
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
562 /* Prevent redisplay shortcuts when changing the hscroll. */
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
563 if (XINT (w->hscroll) != hscroll)
25375
919b568e4108 (Fset_window_hscroll): Set
Gerd Moellmann <gerd@gnu.org>
parents: 25356
diff changeset
564 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
565
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
566 w->hscroll = make_number (hscroll);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567 return ncol;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
568 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
570 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
571 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
572 doc: /* Return WINDOW's redisplay end trigger value.
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
573 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
574 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
575 (window)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
576 Lisp_Object window;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
577 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
578 return decode_window (window)->redisplay_end_trigger;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
579 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
580
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
581 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
582 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
583 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
584 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
585 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
586 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
587 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
588 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
589 (window, value)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
590 register Lisp_Object window, value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
591 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
592 register struct window *w;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
593
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
594 w = decode_window (window);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
595 w->redisplay_end_trigger = value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
596 return value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
597 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
598
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599 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
600 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
601 \(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
602 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
603 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
604 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
605 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
606 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
607 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
609 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
610 register struct window *w = decode_any_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
611
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
612 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
613 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
614 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
615 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
616 Qnil))));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
618
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
619 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
620 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
621 \(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
622 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
623 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
624 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
625 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
626 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
627 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
628 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
629 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
630 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
631
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
632 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
633 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
634 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
635 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
636 Qnil))));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
637 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
638
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
639 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
640 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
641 \(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
642 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
643 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
644 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
645 display margins, fringes, header line, and/or mode line. */)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
646 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
647 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
648 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
649 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
650
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
651 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
652 + WINDOW_LEFT_MARGIN_COLS (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
653 + WINDOW_LEFT_FRINGE_COLS (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
654 make_number (WINDOW_TOP_EDGE_LINE (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
655 + 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
656 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
657 - WINDOW_RIGHT_MARGIN_COLS (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
658 - WINDOW_RIGHT_FRINGE_COLS (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
659 make_number (WINDOW_BOTTOM_EDGE_LINE (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
660 - WINDOW_MODE_LINE_LINES (w)));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
661 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
662
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
663 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
664 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
665 \(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
666 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
667 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
668 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
669 display margins, fringes, header line, and/or mode line. */)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
670 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
671 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
672 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
673 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
674
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
675 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
676 + WINDOW_LEFT_MARGIN_WIDTH (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
677 + WINDOW_LEFT_FRINGE_WIDTH (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
678 make_number (WINDOW_TOP_EDGE_Y (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
679 + 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
680 make_number (WINDOW_BOX_RIGHT_EDGE_X (w)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
681 - WINDOW_RIGHT_MARGIN_WIDTH (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
682 - WINDOW_RIGHT_FRINGE_WIDTH (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
683 make_number (WINDOW_BOTTOM_EDGE_Y (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
684 - WINDOW_MODE_LINE_HEIGHT (w)));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
685 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
686
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
687 /* 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
688 If it is not, return ON_NOTHING;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
689 if it is in the window's text area,
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
690 set *x and *y to its location relative to the upper left corner
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
691 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
692 return ON_TEXT;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
693 if it is on the window's modeline, return ON_MODE_LINE;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
694 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
695 return ON_VERTICAL_BORDER.
56542
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
696 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
697 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
698 if it is on the window's top line, return ON_HEADER_LINE;
41127
d7459915009d Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 40656
diff changeset
699 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
700 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
701 to window-relative coordinates;
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
702 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
703 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
704 to window-relative coordinates.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
705
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
706 X and Y are frame relative pixel coordinates. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
707
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
708 static enum window_part
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
709 coordinates_in_window (w, x, y)
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
710 register struct window *w;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
711 register int *x, *y;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
712 {
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
713 struct frame *f = XFRAME (WINDOW_FRAME (w));
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
714 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
715 enum window_part part;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
716 int ux = FRAME_COLUMN_WIDTH (f);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
717 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
718 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
719 /* 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
720 (Between mode lines for instance. */
f03dfbb443ce (coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents: 36068
diff changeset
721 int grabbable_width = ux;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
722 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
723
28918
e42cd428f056 (coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents: 28726
diff changeset
724 /* 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
725 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
726 if (w->pseudo_window_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
727 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
728 left_x = 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
729 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
730 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
731 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
732 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
733 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
734 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
735 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
736 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
737 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
738 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
739 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
740
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
741 /* Outside any interesting row? */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
742 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
743 return ON_NOTHING;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
744
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
745 /* 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
746 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
747 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
748 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
749 scroll bars. */
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
750
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
751 if (WINDOW_WANTS_MODELINE_P (w)
53129
070325c3884d (coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents: 52853
diff changeset
752 && *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
753 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
754 part = ON_MODE_LINE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
755
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
756 header_vertical_border_check:
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
757 /* 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
758 between mode lines of horizontally adjacent mode lines
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
759 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
760 return the right window. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
761 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
762 || WINDOW_RIGHTMOST_P (w))
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
763 {
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
764 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
765 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
766 /* 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
767 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
768 *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
769 *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
770 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
771 }
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
772 }
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
773 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
774 {
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
775 if (eabs (*x - x1) < grabbable_width)
70042
abc53f51fd3e (coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents: 69606
diff changeset
776 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
777 /* 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
778 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
779 *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
780 *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
781 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
782 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
783 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
784
57309
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
785 if (*x < x0 || *x >= x1)
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
786 return ON_NOTHING;
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
787
51477
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
788 /* 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
789 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
790 *x -= x0;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
791 *y -= top_y;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
792 return part;
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
793 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
794
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
795 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
796 && *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
797 {
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
798 part = ON_HEADER_LINE;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
799 goto header_vertical_border_check;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
800 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
801
57309
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
802 if (*x < x0 || *x >= x1)
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
803 return ON_NOTHING;
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
804
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
805 /* Outside any interesting column? */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
806 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
807 {
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
808 *y -= top_y;
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
809 return ON_SCROLL_BAR;
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
810 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
811
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
812 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
813 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
814
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
815 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
816 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
817
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
818 if (FRAME_WINDOW_P (f))
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
819 {
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
820 if (!w->pseudo_window_p
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
821 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
822 && !WINDOW_RIGHTMOST_P (w)
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
823 && (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
824 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
825 /* 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
826 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
827 *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
828 *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
829 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
830 }
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
831 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
832 else
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
833 {
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
834 /* 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
835 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
836 if (!w->pseudo_window_p
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
837 && !WINDOW_RIGHTMOST_P (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
838 && *x > right_x - ux)
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
839 {
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
840 /* 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
841 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
842 *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
843 *y -= top_y;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
844 return ON_VERTICAL_BORDER;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
845 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
846 }
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
847
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
848 if (*x < text_left)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
849 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
850 if (lmargin_width > 0
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
851 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
852 ? (*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
853 : (*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
854 {
53129
070325c3884d (coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents: 52853
diff changeset
855 *x -= left_x;
51477
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
856 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
857 *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
858 *y -= top_y;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
859 return ON_LEFT_MARGIN;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
860 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
861
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
862 /* 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
863 *x -= left_x;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
864 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
865 return ON_LEFT_FRINGE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
866 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
867
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
868 if (*x >= text_right)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
869 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
870 if (rmargin_width > 0
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
871 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
872 ? (*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
873 : (*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
874 {
66030
999beda71a39 (coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents: 66018
diff changeset
875 *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
876 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
877 *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
878 *y -= top_y;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
879 return ON_RIGHT_MARGIN;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
880 }
51207
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 /* 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
883 *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
884 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
885 return ON_RIGHT_FRINGE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
886 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
887
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
888 /* 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
889 *x -= text_left;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
890 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
891 return ON_TEXT;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
892 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
893
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
894
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
895 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
896 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
897 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
898 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
899 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
900 \(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
901 frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
902 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
903 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
904 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
905 If they are in the top mode line of WINDOW, `header-line' is returned.
41127
d7459915009d Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 40656
diff changeset
906 If they are in the left fringe of WINDOW, `left-fringe' is returned.
d7459915009d Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 40656
diff changeset
907 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
908 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
909 `vertical-line' is returned.
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
910 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
911 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
912 (coordinates, window)
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
913 register Lisp_Object coordinates, window;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
914 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
915 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
916 struct frame *f;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
917 int x, y;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
918 Lisp_Object lx, ly;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
919
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
920 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
921 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
922 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
923 CHECK_CONS (coordinates);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
924 lx = Fcar (coordinates);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
925 ly = Fcdr (coordinates);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
926 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
927 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
928 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
929 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
930
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
931 switch (coordinates_in_window (w, &x, &y))
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
932 {
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
933 case ON_NOTHING:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
934 return Qnil;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
935
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
936 case ON_TEXT:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
937 /* 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
938 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
939 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
940 FRAME_CANON_Y_FROM_PIXEL_Y (f, y));
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
941
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
942 case ON_MODE_LINE:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
943 return Qmode_line;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
944
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
945 case ON_VERTICAL_BORDER:
732
a8d94735277e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 722
diff changeset
946 return Qvertical_line;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
947
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
948 case ON_HEADER_LINE:
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
949 return Qheader_line;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
950
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
951 case ON_LEFT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
952 return Qleft_fringe;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
953
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
954 case ON_RIGHT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
955 return Qright_fringe;
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
956
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
957 case ON_LEFT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
958 return Qleft_margin;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
959
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
960 case ON_RIGHT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
961 return Qright_margin;
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
962
56542
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
963 case ON_SCROLL_BAR:
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
964 /* 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
965 return Qnil;
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
966
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
967 default:
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
968 abort ();
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
969 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
970 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
971
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
972
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
973 /* 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
974 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
975 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
976
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
977 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
978 does, return W in *CW->window, as Lisp_Object, and return in
30777
3e4912d77e89 Fix embedded comment.
Dave Love <fx@gnu.org>
parents: 30743
diff changeset
979 *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
980 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
981
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
982 struct check_window_data
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
983 {
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
984 Lisp_Object *window;
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
985 int *x, *y;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
986 enum window_part *part;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
987 };
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
988
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
989 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
990 check_window_containing (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
991 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
992 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
993 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
994 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
995 enum window_part found;
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
996 int continue_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
997
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
998 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
999 if (found != ON_NOTHING)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1000 {
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1001 *cw->part = found;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1002 XSETWINDOW (*cw->window, w);
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
1003 continue_p = 0;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1004 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1005
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
1006 return continue_p;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1007 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1008
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1009
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1010 /* 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
1011 return it as a Lisp_Object.
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1012
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1013 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
1014 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
1015 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
1016
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1017 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
1018 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
1019
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1020 This function was previously implemented with a loop cycling over
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1021 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
1022 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
1023 implementation of next_window using Vwindow_list, because
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1024 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
1025 tree of F when this function is called asynchronously from
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1026 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
1027 case. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1028
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1029 Lisp_Object
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1030 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
1031 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1032 int x, y;
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1033 enum window_part *part;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1034 int *wx, *wy;
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
1035 int tool_bar_p;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1036 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1037 Lisp_Object window;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1038 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
1039 enum window_part dummy;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1040
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1041 if (part == 0)
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1042 part = &dummy;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1043
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1044 window = Qnil;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1045 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
1046 foreach_window (f, check_window_containing, &cw);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1047
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1048 /* 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
1049 bar exists. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1050 if (NILP (window)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1051 && tool_bar_p
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1052 && WINDOWP (f->tool_bar_window)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1053 && 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
1054 && (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
1055 != ON_NOTHING))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1056 {
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1057 *part = ON_TEXT;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1058 window = f->tool_bar_window;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1059 }
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
1060
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1061 if (wx) *wx = x;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1062 if (wy) *wy = y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1063
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1064 return window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066
681
026f978690be *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 555
diff changeset
1067 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
1068 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
1069 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
1070 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
1071 column 0. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1072 (x, y, frame)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1073 Lisp_Object x, y, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1074 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1075 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1077 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
1078 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1079 CHECK_LIVE_FRAME (frame);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1080 f = XFRAME (frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1081
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1082 /* 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
1083 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
1084 CHECK_NUMBER_OR_FLOAT (y);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1085
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1086 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
1087 (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
1088 + 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
1089 (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
1090 + FRAME_INTERNAL_BORDER_WIDTH (f)),
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1091 0, 0, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 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
1095 doc: /* Return current value of point in WINDOW.
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1096 WINDOW defaults to the selected window.
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1097
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1098 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
1099 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
1100
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1101 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
1102 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
1103 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
1104 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
1105 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
1106 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 && current_buffer == XBUFFER (w->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 return Fpoint ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114 return Fmarker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1115 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 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
1118 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
1119 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
1120 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
1121 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1124 return Fmarker_position (decode_window (window)->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1125 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1126
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1127 /* 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
1128
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1129 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
1130 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
1131 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
1132 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
1133 (save-excursion
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1134 (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
1135 (vertical-motion (1- (window-height window)) window)
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1136 (point))") */
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1137
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1138 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
1139 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
1140 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
1141 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
1142 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
1143 does not update this value.
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
1144 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
1145 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
1146 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
1147 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
1148 (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
1149 Lisp_Object window, update;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1151 Lisp_Object value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 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
1153 Lisp_Object buf;
72998
79ada95d4018 (Fwindow_end): Fix recent change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72990
diff changeset
1154 struct buffer *b;
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1155
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1156 buf = w->buffer;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1157 CHECK_BUFFER (buf);
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1158 b = XBUFFER (buf);
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1159
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1160 #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
1161 /* 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
1162 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
1163 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
1164 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
1165 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
1166 return Qnil;
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1167 #endif
8492
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1168
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1169 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
1170 && ! (! 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
1171 && XFASTINT (w->last_modified) >= BUF_MODIFF (b)
75080
1026dad5d8c9 (Fwindow_end): Fix use of >= operator.
Juanma Barranquero <lekktu@gmail.com>
parents: 75077
diff changeset
1172 && 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
1173 && !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
1174 {
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1175 struct text_pos startp;
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1176 struct it it;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1177 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
1178
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1179 /* 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
1180 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
1181 if (b != current_buffer)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1182 {
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1183 old_buffer = current_buffer;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1184 set_buffer_internal (b);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1185 }
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1186
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1187 /* 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
1188 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
1189 `-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
1190 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
1191 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
1192 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
1193 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
1194 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
1195 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
1196 else
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1197 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
1198
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1199 start_display (&it, w, startp);
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1200 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
1201 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
1202 move_it_past_eol (&it);
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1203 value = make_number (IT_CHARPOS (it));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1204
36231
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1205 if (old_buffer)
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1206 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
1207 }
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1208 else
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1209 XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1210
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1211 return value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1212 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1214 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
1215 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
1216 Return POS. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1217 (window, pos)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218 Lisp_Object window, pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1220 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1222 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
1223 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
1224 && XBUFFER (w->buffer) == current_buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1225 Fgoto_char (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1226 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1227 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
1228
34615
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1229 /* 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
1230 the new value of point. */
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1231 if (!EQ (window, selected_window))
34491
f9d400d4653a (Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents: 34417
diff changeset
1232 ++windows_or_buffers_changed;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1233
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 return pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 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
1238 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
1239 WINDOW defaults to the selected window. Return POS.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1240 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
1241 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
1242 (window, pos, noforce)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 Lisp_Object window, pos, noforce;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1246
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1247 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 set_marker_restricted (w->start, pos, w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1249 /* this is not right, but much easier than doing what is right. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 w->start_at_line_beg = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1251 if (NILP (noforce))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1253 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
1254 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
1255 XSETFASTINT (w->last_overlay_modified, 0);
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1256 if (!EQ (window, selected_window))
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1257 windows_or_buffers_changed++;
25387
df0083768b79 (Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents: 25375
diff changeset
1258
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 return pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1260 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1261
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1262
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1263 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
1264 0, 1, 0,
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1265 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
1266 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
1267 `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
1268 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
1269 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
1270 the selected window.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1271
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1272 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
1273 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
1274 `get-largest-window' treat dedicated windows specially.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1275 `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
1276 `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
1277
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1278 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
1279 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
1280 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
1281 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1282 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1283 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1284 return decode_window (window)->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1287 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p,
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1288 Sset_window_dedicated_p, 2, 2, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1289 doc: /* Mark WINDOW as dedicated according to FLAG.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1290 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
1291 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
1292 Return FLAG.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1293
99160
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1294 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
1295 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
1296 `get-largest-window' treat dedicated windows specially.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1297 `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
1298 `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
1299 frame.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1300
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1301 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
1302 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
1303 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
1304 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
1305 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
1306 (window, flag)
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1307 Lisp_Object window, flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1311 w->dedicated = flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1312 return w->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1313 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1315
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1316 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
1317 0, 1, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1318 doc: /* Return the parameters of WINDOW and their values.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1319 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
1320 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
1321 (window)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1322 Lisp_Object window;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1323 {
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1324 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
1325 }
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1326
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1327 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
1328 2, 2, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1329 doc: /* Return WINDOW's value for PARAMETER.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1330 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
1331 (window, parameter)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1332 Lisp_Object window, parameter;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1333 {
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1334 Lisp_Object result;
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1335
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1336 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
1337 return CDR_SAFE (result);
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1338 }
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 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
1341 Sset_window_parameter, 3, 3, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1342 doc: /* Set WINDOW's value of PARAMETER to VALUE.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1343 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
1344 (window, parameter, value)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1345 Lisp_Object window, parameter, value;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1346 {
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1347 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
1348 Lisp_Object old_alist_elt;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1349
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1350 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
1351 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
1352 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
1353 else
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1354 Fsetcdr (old_alist_elt, value);
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1355 return value;
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1356 }
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1357
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1358
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1360 0, 1, 0,
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1361 doc: /* Return the display-table that WINDOW is using.
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1362 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
1363 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1365 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1366 return decode_window (window)->display_table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1367 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1369 /* 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
1370 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
1371 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
1372 return 0. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1373
13187
1a4cee562d33 (window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents: 13126
diff changeset
1374 struct Lisp_Char_Table *
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375 window_display_table (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377 {
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1378 struct Lisp_Char_Table *dp = NULL;
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1379
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1380 if (DISP_TABLE_P (w->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1381 dp = XCHAR_TABLE (w->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1382 else if (BUFFERP (w->buffer))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1383 {
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1384 struct buffer *b = XBUFFER (w->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1385
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1386 if (DISP_TABLE_P (b->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1387 dp = XCHAR_TABLE (b->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1388 else if (DISP_TABLE_P (Vstandard_display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1389 dp = XCHAR_TABLE (Vstandard_display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1390 }
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1391
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1392 return dp;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1394
555
e09a318cf838 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 548
diff changeset
1395 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
1396 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
1397 (window, table)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1398 register Lisp_Object window, table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1399 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403 w->display_table = table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1404 return table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1407 /* Record info on buffer window w is displaying
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 when it is about to cease to display that buffer. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1409 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1410 unshow_buffer (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1412 {
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1413 Lisp_Object buf;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1414 struct buffer *b;
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1415
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1416 buf = w->buffer;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1417 b = XBUFFER (buf);
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1418 if (b != XMARKER (w->pointm)->buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1419 abort ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1420
5990
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1421 #if 0
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1422 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423 || ! EQ (buf, XWINDOW (selected_window)->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 /* Do this except when the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1425 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
1426 #endif
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1427 /* 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
1428 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
1429 Now that this statement is unconditional,
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1430 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
1431 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
1432 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
1433 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
1434 b->last_window_start = marker_position (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1435
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436 /* Point in the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 is actually stored in that buffer, and the window's pointm isn't used.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438 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
1439 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
1440 /* 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
1441 && !(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
1442 && 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
1443 && 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
1444 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
1445 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
1446 XMARKER (w->pointm)->charpos,
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1447 BUF_ZV (b)),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1448 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
1449 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
1450 BUF_ZV_BYTE (b)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1451
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1452 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
1453 && 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
1454 b->last_selected_window = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1455 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457 /* Put replacement into the window structure in place of old. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1458 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 replace_window (old, replacement)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 Lisp_Object old, replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1462 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1464
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1465 /* If OLD is its frame's root_window, then replacement is the new
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1466 root_window for that frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1467
1525
f79a22ad87d0 * window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents: 1444
diff changeset
1468 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame))))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1469 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1471 p->left_col = o->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1472 p->top_line = o->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1473 p->total_cols = o->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1474 p->total_lines = o->total_lines;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1475 p->desired_matrix = p->current_matrix = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1476 p->vscroll = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1477 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1478 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1479 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1480 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
1481 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1482 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1483 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1484 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1485 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1486 p->window_end_valid = Qnil;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
1487 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
1488 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490 p->next = tem = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1491 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492 XWINDOW (tem)->prev = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1494 p->prev = tem = o->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1495 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1496 XWINDOW (tem)->next = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1497
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1498 p->parent = tem = o->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1499 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1500 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1501 if (EQ (XWINDOW (tem)->vchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1502 XWINDOW (tem)->vchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1503 if (EQ (XWINDOW (tem)->hchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1504 XWINDOW (tem)->hchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1505 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1506
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1507 /*** Here, if replacement is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1508 and so is its new parent, we should make replacement's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1509 children be children of that parent instead. ***/
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1510 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1511
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1512 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1513 doc: /* Remove WINDOW from the display. Default is selected window. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1514 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1515 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1516 {
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1517 struct frame *f;
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1518 if (NILP (window))
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1519 window = selected_window;
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1520 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1521 delete_window (window);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1522
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1523 run_window_configuration_change_hook (f);
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1524
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1525 return Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1526 }
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1527
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
1528 void
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1529 delete_window (window)
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1530 register Lisp_Object window;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1531 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 register Lisp_Object tem, parent, sib;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 register struct window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 register struct window *par;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1535 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1537 /* 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
1538 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
1539 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
1540 CHECK_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541 p = XWINDOW (window);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1542
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1543 /* 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
1544 if (NILP (p->buffer)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1545 && NILP (p->hchild)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1546 && NILP (p->vchild))
17365
fc2ec9ced22f (delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents: 17281
diff changeset
1547 return;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1548
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1549 parent = p->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1550 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1551 error ("Attempt to delete minibuffer or sole ordinary window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 par = XWINDOW (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1553
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1554 windows_or_buffers_changed++;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1555 Vwindow_list = Qnil;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1556 f = XFRAME (WINDOW_FRAME (p));
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1557 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1559 /* 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
1560 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1561 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
1562
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1563 /* 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
1564 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
1565 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
1566 swindow = FRAME_SELECTED_WINDOW (f);
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1567
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1568 while (1)
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1569 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1570 pwindow = swindow;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1571 while (!NILP (pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1572 {
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1573 if (EQ (window, pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1574 break;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1575 pwindow = XWINDOW (pwindow)->parent;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1576 }
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1577
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1578 /* 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
1579 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
1580 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
1581 break;
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1582 /* Otherwise, try another window for SWINDOW. */
77905
2fd30dc1a157 (delete_window): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents: 77883
diff changeset
1583 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
1584
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1585 /* 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
1586 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
1587 so we cannot delete. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1588 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
1589 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
1590 }
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1591
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1592 /* 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
1593 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
1594 {
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1595 /* 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
1596 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
1597 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
1598 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
1599 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
1600 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
1601 Fselect_window (swindow, Qnil);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1602 else
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1603 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
1604 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1605 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1606
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1607 /* 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
1608 window_deletion_count++;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1609
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1610 tem = p->buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1611 /* tem is null for dummy parent windows
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1612 (which have inferiors but not any contents themselves) */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1613 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1614 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1615 unshow_buffer (p);
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
1616 unchain_marker (XMARKER (p->pointm));
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
1617 unchain_marker (XMARKER (p->start));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1618 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1619
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1620 /* 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
1621 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
1622 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
1623 processed while we are changing them. */
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1624 BLOCK_INPUT;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1625 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1626
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1627 tem = p->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1628 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1629 XWINDOW (tem)->prev = p->prev;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1630
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1631 tem = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1632 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633 XWINDOW (tem)->next = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1634
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 if (EQ (window, par->hchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636 par->hchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1637 if (EQ (window, par->vchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1638 par->vchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1639
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 /* Find one of our siblings to give our space to. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 sib = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1642 if (NILP (sib))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 /* If p gives its space to its next sibling, that sibling needs
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 to have its top/left side pulled back to where p's is.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1646 set_window_{height,width} will re-position the sibling's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1647 children. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 sib = p->next;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1649 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
1650 XWINDOW (sib)->left_col = p->left_col;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1651 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1652
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1653 /* Stretch that sibling. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1654 if (!NILP (par->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1655 set_window_height (sib,
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1656 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657 1);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1658 if (!NILP (par->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1659 set_window_width (sib,
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1660 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1661 1);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1662
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 /* If parent now has only one child,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1664 put the child into the parent's place. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1665 tem = par->hchild;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1666 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1667 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
1668 if (NILP (XWINDOW (tem)->next)) {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 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
1670 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
1671 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1672
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1673 /* 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
1674 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
1675 if (! NILP (p->hchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1676 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
1677 else if (! NILP (p->vchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1678 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
1679
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1680 /* Mark this window as deleted. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1681 p->buffer = p->hchild = p->vchild = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1682
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
1683 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
1684 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
1685
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 /* 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
1687 one of them. */
64133
7e06f331c228 (Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents: 64114
diff changeset
1688
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
1689 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
1690 {
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1691 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
1692 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
1693 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
1694 }
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1695 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
1696 {
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1697 p = 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
1698 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
1699 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
1700 }
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 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
1702 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
1703
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
1704 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
1705 {
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 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
1707 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
1708 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
1709 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
1710 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
1711 }
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 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
1713 /* 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
1714 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
1715 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
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 -> 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
1718 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
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 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
1721 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
1722 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
1723 }
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 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
1725 }
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
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
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1728 /* Adjust glyph matrices. */
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1729 adjust_glyphs (f);
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1730 UNBLOCK_INPUT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1732
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1733
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1735 /***********************************************************************
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1736 Window List
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1737 ***********************************************************************/
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1738
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1739 /* 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
1740 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
1741 function window_list. */
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1742
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1743 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1744 add_window_to_list (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1745 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1746 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1747 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1748 Lisp_Object *list = (Lisp_Object *) user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1749 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1750 XSETWINDOW (window, w);
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1751 *list = Fcons (window, *list);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1752 return 1;
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
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1755
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1756 /* 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
1757 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
1758 list, cache it in Vwindow_list, and return that. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1759
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1760 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1761 window_list ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1762 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1763 if (!CONSP (Vwindow_list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1764 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1765 Lisp_Object tail;
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1766
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1767 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1768 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
1769 {
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1770 Lisp_Object args[2];
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1771
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1772 /* 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
1773 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
1774 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
1775 args[1] = Qnil;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1776 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
1777 args[0] = Vwindow_list;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1778 args[1] = Fnreverse (args[1]);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1779 Vwindow_list = Fnconc (2, args);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1780 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1781 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1782
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1783 return Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1784 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1785
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1786
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1787 /* 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
1788 OWINDOW, MINIBUF and ALL_FRAMES.
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1789
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1790 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
1791 `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
1792 a window means a specific minibuffer window
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1793
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1794 ALL_FRAMES t means search all frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1795 nil means search just current frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1796 `visible' means search just visible frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1797 0 means search visible and iconified frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1798 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
1799 a frame means consider windows on that frame, only. */
30037
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 static int
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1802 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
1803 Lisp_Object window, owindow, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1804 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1805 struct window *w = XWINDOW (window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1806 struct frame *f = XFRAME (w->frame);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1807 int candidate_p = 1;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1808
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1809 if (!BUFFERP (w->buffer))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1810 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1811 else if (MINI_WINDOW_P (w)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1812 && (EQ (minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1813 || (WINDOWP (minibuf) && !EQ (minibuf, window))))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1814 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1815 /* If MINIBUF is `lambda' don't consider any mini-windows.
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1816 If it is a window, consider only that one. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1817 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1818 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1819 else if (EQ (all_frames, Qt))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1820 candidate_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1821 else if (NILP (all_frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1822 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1823 xassert (WINDOWP (owindow));
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1824 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
1825 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1826 else if (EQ (all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1827 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1828 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
1829 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
1830 && (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
1831 == 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
1832
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1833 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1834 else if (INTEGERP (all_frames) && XINT (all_frames) == 0)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1835 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1836 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
1837 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
1838 #ifdef HAVE_X_WINDOWS
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
1839 /* 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
1840 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
1841 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
1842 `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
1843 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
1844 that yet. --Stef */
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
1845 || (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
1846 && !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
1847 #endif
85010
a3defcbdb064 (candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84758
diff changeset
1848 )
a3defcbdb064 (candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84758
diff changeset
1849 && (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
1850 == FRAME_TERMINAL (XFRAME (selected_frame)));
30037
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 else if (WINDOWP (all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1853 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1854 || EQ (XWINDOW (all_frames)->frame, w->frame)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1855 || 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
1856 else if (FRAMEP (all_frames))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1857 candidate_p = EQ (all_frames, w->frame);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1858
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1859 return candidate_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1860 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1861
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1862
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1863 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1864 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
1865 ALL_FRAMES. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1866
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1867 static void
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1868 decode_next_window_args (window, minibuf, all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1869 Lisp_Object *window, *minibuf, *all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1870 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1871 if (NILP (*window))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1872 *window = selected_window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1873 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1874 CHECK_LIVE_WINDOW (*window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1875
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1876 /* 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
1877 does. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1878 if (NILP (*minibuf))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1879 *minibuf = minibuf_level ? minibuf_window : Qlambda;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1880 else if (!EQ (*minibuf, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1881 *minibuf = Qlambda;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1882
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1883 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda'
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1884 => count none of them, or a specific minibuffer window (the
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1885 active one) to count. */
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 /* ALL_FRAMES nil doesn't specify which frames to include. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1888 if (NILP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1889 *all_frames = (!EQ (*minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1890 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1891 : Qnil);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1892 else if (EQ (*all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1893 ;
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
1894 else if (EQ (*all_frames, make_number (0)))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1895 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1896 else if (FRAMEP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1897 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1898 else if (!EQ (*all_frames, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1899 *all_frames = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1900
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1901 /* 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
1902 search just current frame, `visible' meaning search just visible
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1903 frames, 0 meaning search visible and iconified frames, or a
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1904 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
1905 frame, meaning consider windows on that frame, only. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1906 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1907
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1908
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1909 /* Return the next or previous window of WINDOW in canonical ordering
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1910 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
1911 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
1912 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 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1915 next_window (window, minibuf, all_frames, next_p)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1916 Lisp_Object window, minibuf, all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1917 int next_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1918 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1919 decode_next_window_args (&window, &minibuf, &all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1920
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1921 /* 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
1922 return the first window on the frame. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1923 if (FRAMEP (all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1924 && !EQ (all_frames, XWINDOW (window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1925 return Fframe_first_window (all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1926
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1927 if (next_p)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1928 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1929 Lisp_Object list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1930
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1931 /* Find WINDOW in the list of all windows. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1932 list = Fmemq (window, window_list ());
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1933
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1934 /* 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
1935 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1936 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
1937 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
1938 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1939
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1940 /* 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
1941 if (!CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1942 for (list = Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1943 CONSP (list) && !EQ (XCAR (list), window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1944 list = XCDR (list))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1945 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
1946 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1947
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1948 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1949 window = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1950 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1951 else
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1952 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1953 Lisp_Object candidate, list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1954
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1955 /* 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
1956 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
1957 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
1958 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
1959 candidate = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1960 for (list = window_list (); CONSP (list); list = XCDR (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1961 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1962 if (EQ (XCAR (list), window))
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 (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1965 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1966 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1967 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
1968 all_frames))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1969 candidate = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1970 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1971
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1972 if (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1973 window = candidate;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1974 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1975
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1976 return window;
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
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
1979
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
1980 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1981 doc: /* Return next window after WINDOW in canonical ordering of windows.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1982 If omitted, WINDOW defaults to the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1983
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1984 Optional second arg MINIBUF t means count the minibuffer window even
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1985 if not active. MINIBUF nil or omitted means count the minibuffer iff
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1986 it is active. MINIBUF neither t nor nil means not to count the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1987 minibuffer even if it is active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1988
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1989 Several frames may share a single minibuffer; if the minibuffer
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1990 counts, all windows on all frames that share that minibuffer count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1991 too. Therefore, `next-window' can be used to iterate through the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1992 set of windows even when the minibuffer is on another frame. If the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1993 minibuffer does not count, only windows from WINDOW's frame count.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1994
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1995 Optional third arg ALL-FRAMES t means include windows on all frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1996 ALL-FRAMES nil or omitted means cycle within the frames as specified
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1997 above. ALL-FRAMES = `visible' means include windows on all visible frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1998 ALL-FRAMES = 0 means include windows on all visible and iconified frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1999 If ALL-FRAMES is a frame, restrict search to windows on that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2000 Anything else means restrict to WINDOW's frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2001
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2002 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
2003 `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
2004 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
2005 `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
2006 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2007 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2009 return next_window (window, minibuf, all_frames, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2010 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2012
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2013 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2014 doc: /* Return the window preceding WINDOW in canonical ordering of windows.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2015 If omitted, WINDOW defaults to the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2016
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2017 Optional second arg MINIBUF t means count the minibuffer window even
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2018 if not active. MINIBUF nil or omitted means count the minibuffer iff
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2019 it is active. MINIBUF neither t nor nil means not to count the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2020 minibuffer even if it is active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2021
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2022 Several frames may share a single minibuffer; if the minibuffer
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2023 counts, all windows on all frames that share that minibuffer count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2024 too. Therefore, `previous-window' can be used to iterate through
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2025 the set of windows even when the minibuffer is on another frame. If
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2026 the minibuffer does not count, only windows from WINDOW's frame count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2027
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2028 Optional third arg ALL-FRAMES t means include windows on all frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2029 ALL-FRAMES nil or omitted means cycle within the frames as specified
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2030 above. ALL-FRAMES = `visible' means include windows on all visible frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2031 ALL-FRAMES = 0 means include windows on all visible and iconified frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2032 If ALL-FRAMES is a frame, restrict search to windows on that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2033 Anything else means restrict to WINDOW's frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2034
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2035 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
2036 `previous-window' to iterate through the entire cycle of acceptable
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2037 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
2038 `next-window' traverses the same cycle, in the reverse order. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2039 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2040 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2041 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2042 return next_window (window, minibuf, all_frames, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2043 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2044
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2045
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
2046 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2047 doc: /* Select the ARG'th different window on this frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2048 All windows on current frame are arranged in a cyclic order.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2049 This command selects the window ARG steps away in that order.
56393
8eb84bf840a8 (Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56174
diff changeset
2050 A negative ARG moves in the opposite order. The optional second
68490
36ac94b7246c (Fother_window, Fwindow_vscroll, Fset_window_vscroll): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 67328
diff changeset
2051 argument ALL-FRAMES has the same meaning as in `next-window', which see. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2052 (arg, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2053 Lisp_Object arg, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2054 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2055 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2056 int i;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2057
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2058 CHECK_NUMBER (arg);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2059 window = selected_window;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2060
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2061 for (i = XINT (arg); i > 0; --i)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2062 window = Fnext_window (window, Qnil, all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2063 for (; i < 0; ++i)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2064 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
2065
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
2066 Fselect_window (window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2067 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2068 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2069
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2070
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2071 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
2072 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
2073 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
2074 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
2075 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
2076 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
2077 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
2078 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
2079 (frame, minibuf, window)
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2080 Lisp_Object frame, minibuf, window;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2081 {
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2082 if (NILP (window))
69104
527507f1a62e (Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68987
diff changeset
2083 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
2084 CHECK_WINDOW (window);
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2085 if (NILP (frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2086 frame = selected_frame;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2087
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2088 if (!EQ (frame, XWINDOW (window)->frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2089 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
2090
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2091 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
2092 }
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2093
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2094
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2095 /* Return a list of windows in canonical ordering. Arguments are like
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2096 for `next-window'. */
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2097
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2098 static Lisp_Object
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2099 window_list_1 (window, minibuf, all_frames)
30265
9b1c8eafe4dc (Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents: 30102
diff changeset
2100 Lisp_Object window, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2101 {
56456
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2102 Lisp_Object tail, list, rest;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2103
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2104 decode_next_window_args (&window, &minibuf, &all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2105 list = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2106
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2107 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
2108 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
2109 list = Fcons (XCAR (tail), list);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2110
56456
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2111 /* 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
2112 list = Fnreverse (list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2113 rest = Fmemq (window, list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2114 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
2115 {
56616
76bd0e931318 (window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56585
diff changeset
2116 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
2117 ;
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2118 XSETCDR (tail, Qnil);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2119 list = nconc2 (rest, list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2120 }
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2121 return list;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2122 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2123
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2124
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 /* Look at all windows, performing an operation specified by TYPE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 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
2128 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
2129 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
2130 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
2131 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
2132 If MINI is non-zero, perform the operation on minibuffer windows too. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2133
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2134 enum window_loop
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2135 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 WINDOW_LOOP_UNUSED,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137 GET_BUFFER_WINDOW, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2138 GET_LRU_WINDOW, /* Arg is t for full-width windows only */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2139 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2140 DELETE_BUFFER_WINDOWS, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2141 GET_LARGEST_WINDOW,
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2142 UNSHOW_BUFFER, /* Arg is buffer */
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2143 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
2144 CHECK_ALL_WINDOWS
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 };
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2147 static Lisp_Object
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2148 window_loop (type, obj, mini, frames)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2149 enum window_loop type;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2150 Lisp_Object obj, frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2151 int mini;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2152 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2153 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
2154 struct frame *f;
30102
9406cb07bac7 (window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30093
diff changeset
2155 struct gcpro gcpro1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2156
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2157 /* If we're only looping through windows on a particular frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2158 frame points to that frame. If we're looping through windows
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2159 on all frames, frame is 0. */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2160 if (FRAMEP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2161 f = XFRAME (frames);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2162 else if (NILP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2163 f = SELECTED_FRAME ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2164 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2165 f = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2166
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2167 if (f)
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2168 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
2169 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
2170 frame_arg = frames;
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2171 else if (EQ (frames, Qvisible))
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2172 frame_arg = frames;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2173 else
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2174 frame_arg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2175
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2176 /* 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
2177 Qvisible to consider all visible frames,
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2178 or Qt otherwise. */
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2179
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2180 /* 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
2181 if (WINDOWP (obj))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2182 window = obj;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2183 else if (f)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2184 window = FRAME_SELECTED_WINDOW (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2185 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2186 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
2187
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2188 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
2189 GCPRO1 (windows);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2190 best_window = Qnil;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2191
67234
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
2192 for (; CONSP (windows); windows = XCDR (windows))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2193 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2194 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2195
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2196 window = XCAR (windows);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2197 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2198
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2199 /* 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
2200 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
2201 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
2202 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
2203 /* 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
2204 || type == UNSHOW_BUFFER
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2205 || (mini && minibuf_level > 0))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2206 switch (type)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2207 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2208 case GET_BUFFER_WINDOW:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2209 if (EQ (w->buffer, obj)
16522
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
2210 /* Don't find any minibuffer window
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
2211 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
2212 && (MINI_WINDOW_P (w)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2213 ? EQ (window, minibuf_window)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2214 : 1))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2215 {
36068
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2216 if (NILP (best_window))
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2217 best_window = window;
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2218 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
2219 /* 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
2220 RETURN_UNGCPRO (window);
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
2221 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
2222 /* 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
2223 best_window = window;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2224 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2226
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2227 case GET_LRU_WINDOW:
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2228 /* `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
2229 `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
2230 `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
2231 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
2232 || (!(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
2233 /* Minibuffer windows are always ignored. */
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2234 || MINI_WINDOW_P (w))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2235 break;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2236 if (NILP (best_window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237 || (XFASTINT (XWINDOW (best_window)->use_time)
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2238 > XFASTINT (w->use_time)))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2239 best_window = window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2241
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242 case DELETE_OTHER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2243 if (!EQ (window, obj))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2244 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2245 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2246
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2247 case DELETE_BUFFER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2248 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2249 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2250 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
2251
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2252 /* 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
2253 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2254 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2255 && !NILP (w->dedicated)
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2256 && other_visible_frames (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2257 {
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2258 /* 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
2259 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2260 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2261 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2262 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2263 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2264
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2265 /* Now we can safely delete the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2266 Fdelete_frame (w->frame, Qnil);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2267 }
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2268 else if (NILP (w->parent))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2269 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2270 /* 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
2271 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
2272 display there. */
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2273 Lisp_Object buffer;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2274 buffer = Fother_buffer (obj, Qnil, w->frame);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2275 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2276 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2277 Fset_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2278 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2279 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2280 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284 case GET_LARGEST_WINDOW:
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2285 { /* 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
2286 /* 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
2287 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
2288 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2289
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2290 if (NILP (best_window))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2291 best_window = window;
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2292 else
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2293 {
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2294 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
2295 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
2296 > 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
2297 best_window = window;
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2298 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2299 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2302 case UNSHOW_BUFFER:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2303 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2304 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2305 Lisp_Object buffer;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2306 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2307
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2308 /* 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
2309 buffer = Fother_buffer (obj, Qnil, w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2310
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2311 /* 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
2312 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2313 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2314 && !NILP (w->dedicated)
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2315 && other_visible_frames (f))
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2316 {
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2317 /* Skip the other windows on this frame.
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2318 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2319 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2320 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2321 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2322 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2323
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2324 /* Now we can safely delete the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2325 Fdelete_frame (w->frame, Qnil);
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2326 }
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2327 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
2328 {
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2329 Lisp_Object window;
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2330 XSETWINDOW (window, w);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2331 /* 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
2332 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
2333 Fdelete_window (window);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2334 }
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2335 else
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2336 {
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2337 /* 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
2338 w->dedicated = Qnil;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2339 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2340 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2341 Fset_buffer (w->buffer);
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2342 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2343 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 break;
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2345
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2346 case REDISPLAY_BUFFER_WINDOWS:
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2347 if (EQ (w->buffer, obj))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2348 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2349 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
2350 w->update_mode_line = Qt;
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
2351 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
2352 ++update_mode_lines;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2353 best_window = window;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2354 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2355 break;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2356
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2357 /* 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
2358 case CHECK_ALL_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2359 if (! NILP (w->buffer)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2360 && NILP (XBUFFER (w->buffer)->name))
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2361 abort ();
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2362 break;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2363
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2364 case WINDOW_LOOP_UNUSED:
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2365 break;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2366 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2367 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2369 UNGCPRO;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2370 return best_window;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
2371 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2372
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2373 /* 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
2374
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2375 void
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2376 check_all_windows ()
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2377 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2378 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
2379 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2380
66598
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2381 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
2382 doc: /* Return the window least recently selected or used for display.
76825
91cecb8739e7 (Fget_lru_window): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76310
diff changeset
2383 \(LRU means Least Recently Used.)
91cecb8739e7 (Fget_lru_window): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76310
diff changeset
2384
54883
375346b8175c (Fget_lru_window): Doc fix.
Nick Roberts <nickrob@snap.net.nz>
parents: 54267
diff changeset
2385 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
2386 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
2387 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
2388 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
2389 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
2390 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
2391 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
2392 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
2393 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
2394 (frame, dedicated)
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2395 Lisp_Object frame, dedicated;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2396 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2397 register Lisp_Object w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2398 /* 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
2399 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
2400 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
2401 0, frame);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2402 if (!NILP (w) && !EQ (w, selected_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2403 return w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2404 /* 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
2405 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
2406 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
2407 0, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2408 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2409
66598
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2410 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
2411 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
2412 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
2413 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
2414 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
2415 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
2416 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
2417 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
2418 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
2419 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
2420 (frame, dedicated)
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2421 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
2422 {
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2423 return window_loop (GET_LARGEST_WINDOW, dedicated, 0,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2424 frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2425 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2427 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
2428 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
2429 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
2430 current buffer.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2431 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
2432 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
2433 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
2434 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
2435 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
2436 (buffer_or_name, frame)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2437 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
2438 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2439 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2440
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2441 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
2442 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2443 else
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2444 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
2445
9105
984a4b1be1d1 (Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents: 9028
diff changeset
2446 if (BUFFERP (buffer))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2447 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2448 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2449 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 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
2453 0, 1, "",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2454 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
2455 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
2456 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
2457 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
2458 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
2459 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
2460 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
2461 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2462 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2463 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2464 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
2465 int startpos;
35038
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2466 int top, new_top;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2467
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2468 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2469 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2471 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 w = XWINDOW (window);
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2473
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2474 startpos = marker_position (w->start);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2475 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2477 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
2478 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
2479
2190
482c7827b968 (Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
2480 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2482 /* 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
2483 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
2484 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
2485 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
2486 not current, due to typeahead). */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2487 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
2488 if (new_top != top
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2489 && 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
2490 && 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
2491 {
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2492 struct position pos;
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2493 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
2494
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2495 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
2496 /* 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
2497 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
2498 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
2499
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
2500 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
2501 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
2502 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
2503 || 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
2504 : Qnil);
13198
43d90596da34 (Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents: 13187
diff changeset
2505 /* 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
2506 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
2507 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
2508
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2509 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
2510 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2511
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2512 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2514
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515 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
2516 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
2517 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
2518 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
2519 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
2520
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2521 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
2522 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
2523 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
2524 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
2525 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
2526 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
2527 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
2528 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
2529 (buffer_or_name, frame)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2530 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
2531 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2532 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2533
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2534 /* 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
2535 expects. */
22223
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2536 if (NILP (frame))
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2537 frame = Qt;
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2538 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
2539 frame = Qnil;
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2540
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2541 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
2542 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2543 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2544 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2545 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
2546 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2548
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2549 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
2550
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2551 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2552 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2553
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 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
2555 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
2556 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
2557 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
2558 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
2559 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
2560
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2561 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
2562 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
2563 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
2564 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
2565 (buffer_or_name)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2566 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
2567 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2568 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2569
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2570 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
2571 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2572 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2574 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
2575 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2576 }
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2577
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2578 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
2579
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2580 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 }
13918
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2582
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2583 /* 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
2584 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
2585
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2586 void
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2587 replace_buffer_in_all_windows (buffer)
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2588 Lisp_Object buffer;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2589 {
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2590 Lisp_Object tail, frame;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2591
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2592 /* 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
2593 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
2594 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
2595 FOR_EACH_FRAME (tail, frame)
20066
affc9c857428 (replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents: 20046
diff changeset
2596 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
2597 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2598
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2599 /* 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
2600
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2601 /* 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
2602 might crash Emacs. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2603
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2604 #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
2605 #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
2606
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2607 /* 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
2608 the total number of lines of w. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2609
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2610 #define WINDOW_TOTAL_SIZE(w, wp) \
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2611 (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
2612
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2613 /* 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
2614 minimum allowable size. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2615
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2616 void
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2617 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
2618 FRAME_PTR frame;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2619 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
2620 {
4347
d6b289b1a6dc * window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents: 4292
diff changeset
2621 /* 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
2622 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
2623 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
2624 int min_height
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2625 = ((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
2626 ? MIN_SAFE_WINDOW_HEIGHT
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2627 : 2 * MIN_SAFE_WINDOW_HEIGHT);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2628
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2629 if (FRAME_TOP_MARGIN (frame) > 0)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2630 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
2631
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2632 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
2633 *rows = min_height;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2634 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
2635 *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
2636 }
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2637
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2638 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2639 check if W's width can be changed, otherwise check W's height.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2640 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2641 siblings, too. If none of the siblings is resizable, WINDOW isn't
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2642 either. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2643
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2644 static int
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2645 window_fixed_size_p (w, width_p, check_siblings_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2646 struct window *w;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2647 int width_p, check_siblings_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2648 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2649 int fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2650 struct window *c;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2651
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2652 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2653 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2654 c = XWINDOW (w->hchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2655
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2656 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2657 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2658 /* A horizontal combination is fixed-width if all of if its
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2659 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2660 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2661 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2662 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2663 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2664 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2665 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2666 /* A horizontal combination is fixed-height if one of if its
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2667 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2668 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2669 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2670 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2671 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2672 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2673 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2674 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2675 c = XWINDOW (w->vchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2676
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2677 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2678 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2679 /* A vertical combination is fixed-width if one of if its
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2680 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2681 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2682 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2683 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2684 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2685 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2686 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2687 /* A vertical combination is fixed-height if all of if its
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2688 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2689 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2690 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2691 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2692 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2693 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2694 else if (BUFFERP (w->buffer))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2695 {
65602
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2696 struct buffer *old = current_buffer;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2697 Lisp_Object val;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2698
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2699 current_buffer = XBUFFER (w->buffer);
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2700 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
2701 current_buffer = old;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2702
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2703 fixed_p = 0;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2704 if (!EQ (val, Qunbound))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2705 {
65602
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2706 fixed_p = !NILP (val);
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2707
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2708 if (fixed_p
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2709 && ((EQ (val, Qheight) && width_p)
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2710 || (EQ (val, Qwidth) && !width_p)))
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2711 fixed_p = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2712 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2713
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2714 /* Can't tell if this one is resizable without looking at
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2715 siblings. If all siblings are fixed-size this one is too. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2716 if (!fixed_p && check_siblings_p && WINDOWP (w->parent))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2717 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2718 Lisp_Object child;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2719
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
2720 for (child = w->prev; WINDOWP (child); child = XWINDOW (child)->prev)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2721 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2722 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2723
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2724 if (NILP (child))
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
2725 for (child = w->next; WINDOWP (child); child = XWINDOW (child)->next)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2726 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2727 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2728
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2729 if (NILP (child))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2730 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2731 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2732 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2733 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2734 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2735
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2736 return fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2737 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2738
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2739 /* 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
2740 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
2741 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
2742 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
2743 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
2744 minibuffer window, always return 1. */
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2745
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2746 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2747 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
2748 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2749 int width_p, safe_p;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2750 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2751 /* 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
2752 window_min_width here. */
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2753 if (width_p)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2754 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2755 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
2756 + WINDOW_FRINGE_COLS (w)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2757 + WINDOW_SCROLL_BAR_COLS (w));
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2758
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2759 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
2760 }
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2761 else if (MINI_WINDOW_P (w))
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2762 return 1;
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2763 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2764 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2765 int safe_size = (MIN_SAFE_WINDOW_HEIGHT
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2766 + ((BUFFERP (w->buffer)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2767 && !NILP (XBUFFER (w->buffer)->mode_line_format))
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2768 ? 1 : 0));
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2769
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2770 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
2771 }
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2772 }
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2773
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2774 /* 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
2775 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
2776 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
2777 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
2778 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
2779 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
2780 sizes of W's children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2781
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2782 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2783 window_min_size_1 (w, width_p, safe_p)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2784 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2785 int width_p, safe_p;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2786 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2787 struct window *c;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2788 int size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2789
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2790 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2791 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2792 /* W is a horizontal combination. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2793 c = XWINDOW (w->hchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2794 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2795
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2796 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2797 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2798 /* 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
2799 the minimum widths of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2800 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2801 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2802 size += window_min_size_1 (c, 1, safe_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2803 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2804 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2805 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2806 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2807 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2808 /* The minimum height of a horizontal combination is the
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2809 maximum of the minimum heights of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2810 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2811 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2812 size = max (window_min_size_1 (c, 0, safe_p), size);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2813 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2814 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2815 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2816 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2817 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2818 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2819 /* W is a vertical combination. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2820 c = XWINDOW (w->vchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2821 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2822
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2823 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2824 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2825 /* 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
2826 of the minimum widths of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2827 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2828 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2829 size = max (window_min_size_1 (c, 1, safe_p), size);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2830 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2831 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2832 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2833 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2834 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2835 /* 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
2836 the minimum height of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2837 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2838 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2839 size += window_min_size_1 (c, 0, safe_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2840 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2841 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2842 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2843 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2844 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2845 /* W is a leaf window. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2846 size = window_min_size_2 (w, width_p, safe_p);
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2847
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2848 return size;
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2849 }
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2850
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2851 /* 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
2852 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
2853 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
2854 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
2855 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
2856 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
2857 to 1 if W is fixed-size unless FIXED is null. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2858
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2859 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2860 window_min_size (w, width_p, safe_p, ignore_fixed_p, fixed)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2861 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2862 int width_p, safe_p, ignore_fixed_p, *fixed;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2863 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2864 int size, fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2865
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2866 if (ignore_fixed_p)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2867 fixed_p = 0;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2868 else
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2869 fixed_p = window_fixed_size_p (w, width_p, 1);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2870
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2871 if (fixed)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2872 *fixed = fixed_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2873
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2874 if (fixed_p)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2875 size = WINDOW_TOTAL_SIZE (w, width_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2876 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2877 size = window_min_size_1 (w, width_p, safe_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2878
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2879 return size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2880 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2881
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2882
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
2883 /* 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
2884 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
2885 is still too narrow. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2886
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2887 static int
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2888 adjust_window_margins (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2889 struct window *w;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2890 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2891 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
2892 - WINDOW_FRINGE_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2893 - WINDOW_SCROLL_BAR_COLS (w));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2894 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
2895 + WINDOW_RIGHT_MARGIN_COLS (w));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2896
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2897 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
2898 return 1;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2899
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2900 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
2901 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2902
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2903 /* 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
2904 margins will fix that. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2905 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
2906 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
2907 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2908 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
2909 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
2910 = make_number (margin_cols/2);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2911 else
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2912 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
2913 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2914 else
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2915 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
2916 return 1;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2917 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2918
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2919 /* 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
2920 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
2921 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
2922 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
2923 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
2924 shrink columns, otherwise shrink lines.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2925
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2926 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
2927 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
2928 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
2929 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
2930 and scrollbars.
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2931
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2932 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
2933 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
2934 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
2935 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
2936
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2937 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
2938 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
2939 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
2940 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
2941 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
2942 static int *
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2943 shrink_windows (total, size, nchildren, shrinkable, resize_fixed_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2944 forward, width_p, safe_p)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2945 int total, size, nchildren, shrinkable;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2946 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
2947 Lisp_Object forward;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2948 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2949 int available_resize = 0;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2950 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
2951 struct window *c;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2952 Lisp_Object child;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2953 int smallest = total;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2954 int total_removed = 0;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2955 int total_shrink = total - size;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2956 int i;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2957
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2958 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2959 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
2960
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2961 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
2962 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2963 int child_size;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2964
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2965 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2966 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2967
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2968 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
2969 new_sizes[i] = -1;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2970 else
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2971 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2972 new_sizes[i] = child_size;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2973 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
2974 if (child_size > min_sizes[i]
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2975 && NILP (c->resize_proportionally))
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2976 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
2977 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2978 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2979 /* 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
2980 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
2981
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2982 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
2983 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2984 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
2985 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
2986 smallest = new_sizes[i];
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2987
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2988 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
2989 if (new_sizes[i] == smallest)
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2990 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2991 /* 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
2992 new_sizes[i] = 0;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2993 if (smallest > min_sizes[i])
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2994 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
2995 available_resize += smallest;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2996 --shrinkable;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2997 total_removed += smallest;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2998
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
2999 /* 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
3000 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
3001
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3002 /* 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
3003 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
3004 break;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3005 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3006 }
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 /* 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
3009 proportional to its size. */
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3010 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
3011 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3012 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
3013 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3014 int to_shrink = total_shrink * new_sizes[i] / total;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3015
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3016 if (new_sizes[i] - to_shrink < min_sizes[i])
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3017 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
3018 new_sizes[i] -= to_shrink;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3019 total_removed += to_shrink;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3020 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3021 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3022
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3023 /* 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
3024 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
3025 while (total_shrink > total_removed)
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3026 {
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
3027 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
3028 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
3029
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3030 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
3031 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
3032 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3033 ++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
3034 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
3035 }
58441
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3036
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3037 for (i = 0; i < nchildren; ++i)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3038 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
3039 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3040 --new_sizes[i];
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3041 ++total_removed;
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 /* 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
3044 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
3045 break;
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
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 /* 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
3049 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
3050 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
3051 }
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 /* 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
3054 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
3055 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3056 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
3057 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3058 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
3059 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3060 ++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
3061 --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
3062 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
3063 }
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3064 }
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3065 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3066
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3067 xfree (min_sizes);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3068
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3069 return new_sizes;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3070 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3071
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3072 /* 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
3073 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
3074 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
3075
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3076 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
3077 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
3078 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
3079
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3080 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
3081 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
3082 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
3083 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
3084 This should give better behavior when resizing frames. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3085
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3086 static void
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3087 size_window (window, size, width_p, nodelete_p, first_only, last_only)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3088 Lisp_Object window;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3089 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
3090 int first_only, last_only;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3091 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3092 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3093 struct window *c;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3094 Lisp_Object child, *forward, *sideward;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3095 int old_size = WINDOW_TOTAL_SIZE (w, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3096
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3097 size = max (0, size);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3098
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3099 /* Delete WINDOW if it's too small. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3100 if (nodelete_p != 1 && !NILP (w->parent)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3101 && 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
3102 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3103 delete_window (window);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3104 return;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3105 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3106
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3107 /* Set redisplay hints. */
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3108 w->last_modified = make_number (0);
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3109 w->last_overlay_modified = make_number (0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3110 windows_or_buffers_changed++;
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3111 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3112
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3113 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3114 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3115 sideward = &w->vchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3116 forward = &w->hchild;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3117 w->total_cols = make_number (size);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3118 adjust_window_margins (w);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3119 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3120 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3121 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3122 sideward = &w->hchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3123 forward = &w->vchild;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3124 w->total_lines = make_number (size);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3125 w->orig_total_lines = Qnil;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3126 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3127
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3128 if (!NILP (*sideward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3129 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3130 /* We have a chain of parallel siblings whose size should all change. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3131 for (child = *sideward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3132 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3133 c = XWINDOW (child);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3134 if (width_p)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3135 c->left_col = w->left_col;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3136 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3137 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
3138 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
3139 first_only, last_only);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3140 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3141 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3142 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
3143 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3144 /* 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
3145 Lisp_Object last_child;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3146 int child_size;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3147
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3148 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
3149 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3150 c = XWINDOW (child);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3151 last_child = child;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3152 }
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3153
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3154 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3155 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
3156 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
3157 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3158 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
3159 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3160 /* 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
3161 int child_size;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3162
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3163 child = *forward;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3164 c = XWINDOW (child);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3165
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3166 if (width_p)
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3167 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
3168 else
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3169 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
3170
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3171 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3172 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
3173 width_p, nodelete_p, first_only, last_only);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3174 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3175 else if (!NILP (*forward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3176 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3177 int fixed_size, each, extra, n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3178 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
3179 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
3180 int *new_sizes = NULL;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3181
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3182 /* Determine the fixed-size portion of this window, and the
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3183 number of child windows. */
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3184 fixed_size = nchildren = nfixed = total = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3185 for (child = *forward; !NILP (child); child = c->next, ++nchildren)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3186 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3187 int child_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3188
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3189 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3190 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
3191 total += child_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3192
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3193 if (window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3194 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3195 fixed_size += child_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3196 ++nfixed;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3197 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3198 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3199
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3200 /* If the new size is smaller than fixed_size, or if there
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3201 aren't any resizable windows, allow resizing fixed-size
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3202 windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3203 resize_fixed_p = nfixed == nchildren || size < fixed_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3204
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3205 /* Compute how many lines/columns to add/remove to each child. The
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3206 value of extra takes care of rounding errors. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3207 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
3208 if (size < total && n > 1)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3209 new_sizes = shrink_windows (total, size, nchildren, n,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3210 resize_fixed_p, *forward, width_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3211 nodelete_p == 2);
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3212 else
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3213 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3214 each = (size - total) / n;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3215 extra = (size - total) - n * each;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3216 }
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3217
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3218 /* 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
3219 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3220 last_pos = first_pos;
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3221 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3222 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3223 int new_size, old_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3224
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3225 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3226 old_size = WINDOW_TOTAL_SIZE (c, width_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3227 new_size = old_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3228
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3229 /* The top or left edge position of this child equals the
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3230 bottom or right edge of its predecessor. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3231 if (width_p)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3232 c->left_col = make_number (last_pos);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3233 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3234 c->top_line = make_number (last_pos);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3235
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3236 /* If this child can be resized, do it. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3237 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3238 {
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3239 new_size = new_sizes ? new_sizes[n] : old_size + each + extra;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3240 extra = 0;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3241 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3242
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3243 /* Set new size. Note that size_window also propagates
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3244 edge positions to children, so it's not a no-op if we
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3245 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
3246 size_window (child, new_size, width_p, 1, first_only, last_only);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3247
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3248 /* Remember the bottom/right edge position of this child; it
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3249 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
3250 last_pos += new_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3251 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3252
95481
4390d64d3328 Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents: 94963
diff changeset
3253 xfree (new_sizes);
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3254
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3255 /* We should have covered the parent exactly with child windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3256 xassert (size == last_pos - first_pos);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3257
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3258 /* Now delete any children that became too small. */
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3259 if (nodelete_p != 1)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3260 for (child = *forward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3261 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3262 int child_size;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3263
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3264 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3265 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3266 size_window (child, child_size, width_p, nodelete_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3267 first_only, last_only);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3268 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3269 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3270 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3271
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3272 /* 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
3273 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
3274 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
3275 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
3276 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
3277 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
3278 displayed correctly. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3279
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3280 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3281 set_window_height (window, height, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3282 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3283 int height;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3284 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3285 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3286 size_window (window, height, 0, nodelete, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3287 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3288
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3289 /* 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
3290 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
3291 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
3292 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
3293 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
3294 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
3295 displayed correctly. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3296
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3297 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298 set_window_width (window, width, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3299 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3300 int width;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3301 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3302 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3303 size_window (window, width, 1, nodelete, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3304 }
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3305
50367
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3306 /* 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
3307
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3308 void
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3309 change_window_heights (window, n)
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3310 Lisp_Object window;
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3311 int n;
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3312 {
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3313 struct window *w = XWINDOW (window);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3314
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3315 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
3316 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
3317
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3318 if (INTEGERP (w->orig_top_line))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3319 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
3320 if (INTEGERP (w->orig_total_lines))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3321 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
3322
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3323 /* 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
3324 if (!NILP (w->vchild))
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3325 change_window_heights (w->vchild, n);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3326
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3327 /* 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
3328 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
3329 {
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3330 w = XWINDOW (window);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3331 change_window_heights (window, 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 }
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3334
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3335
362
d1e5cf833d37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 358
diff changeset
3336 int window_select_count;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3337
51240
1fe905dd5836 (Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51223
diff changeset
3338 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
3339 EXFUN (Fset_window_scroll_bars, 4);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3340
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3341 static void
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3342 run_funs (Lisp_Object funs)
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3343 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3344 for (; CONSP (funs); funs = XCDR (funs))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3345 if (!EQ (XCAR (funs), Qt))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3346 call0 (XCAR (funs));
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3347 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3348
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3349 static Lisp_Object select_window_norecord (Lisp_Object window);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3350
88050
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3351 void
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3352 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
3353 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3354 int count = SPECPDL_INDEX ();
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3355 Lisp_Object frame, global_wcch
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3356 = Fdefault_value (Qwindow_configuration_change_hook);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3357 XSETFRAME (frame, f);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3358
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3359 if (NILP (Vrun_hooks))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3360 return;
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3361
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3362 if (SELECTED_FRAME () != f)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3363 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3364 record_unwind_protect (Fselect_frame, Fselected_frame ());
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3365 Fselect_frame (frame);
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3366 }
93068
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 /* 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
3369 if (current_buffer != XBUFFER (Fwindow_buffer (Qnil)))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3370 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3371 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3372 Fset_buffer (Fwindow_buffer (Qnil));
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3373 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3374
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3375 /* Look for buffer-local values. */
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3376 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3377 Lisp_Object windows = Fwindow_list (frame, Qlambda, Qnil);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3378 for (; CONSP (windows); windows = XCDR (windows))
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 Lisp_Object window = XCAR (windows);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3381 Lisp_Object buffer = Fwindow_buffer (window);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3382 if (!NILP (Flocal_variable_p (Qwindow_configuration_change_hook,
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3383 buffer)))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3384 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3385 int count = SPECPDL_INDEX ();
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3386 record_unwind_protect (select_window_norecord, Fselected_window ());
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3387 select_window_norecord (window);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3388 run_funs (Fbuffer_local_value (Qwindow_configuration_change_hook,
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3389 buffer));
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3390 unbind_to (count, Qnil);
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3391 }
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3392 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3393 }
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3394
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3395 run_funs (global_wcch);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3396 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
3397 }
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3398
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3399 /* 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
3400 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
3401 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
3402 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
3403 reset from the buffer's local settings. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3404
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3405 void
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3406 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
3407 Lisp_Object window, buffer;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3408 int run_hooks_p, keep_margins_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3409 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3410 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3411 struct buffer *b = XBUFFER (buffer);
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
3412 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
3413 int samebuf = EQ (buffer, w->buffer);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3414
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3415 w->buffer = buffer;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3416
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3417 if (EQ (window, selected_window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3418 b->last_selected_window = window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3419
58441
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3420 /* Let redisplay errors through. */
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3421 b->display_error_modiff = 0;
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3422
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3423 /* Update time stamps of buffer display. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3424 if (INTEGERP (b->display_count))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3425 XSETINT (b->display_count, XINT (b->display_count) + 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3426 b->display_time = Fcurrent_time ();
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3427
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3428 XSETFASTINT (w->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3429 XSETFASTINT (w->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3430 bzero (&w->last_cursor, sizeof w->last_cursor);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3431 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
3432 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
3433 { /* 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
3434 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
3435 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
3436 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
3437 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
3438 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
3439 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
3440 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
3441 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
3442 w->vscroll = 0;
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3443 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
3444 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
3445 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
3446 buffer);
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3447 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
3448 w->force_start = Qnil;
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3449 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
3450 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
3451 }
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3452 /* 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
3453 I doubt it's worth the trouble. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3454 windows_or_buffers_changed++;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3455
98154
b67146e746c0 (set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97141
diff changeset
3456 /* 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
3457 /* We can't check ! NILP (Vwindow_scroll_functions) here
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3458 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
3459 if (window_initialized)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3460 {
98154
b67146e746c0 (set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97141
diff changeset
3461 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3462 Fset_buffer (buffer);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3463 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3464
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
3465 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
3466
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3467 if (!keep_margins_p)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3468 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3469 /* 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
3470
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
3471 /* 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
3472 temporarily disable window margins. */
52617
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3473 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
3474 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
3475
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3476 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
3477
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3478 Fset_window_fringes (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3479 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
3480 b->fringes_outside_margins);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3481
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3482 Fset_window_scroll_bars (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3483 b->scroll_bar_width,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3484 b->vertical_scroll_bar_type, Qnil);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3485
52617
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3486 w->left_margin_cols = save_left;
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3487 w->right_margin_cols = save_right;
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3488
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3489 Fset_window_margins (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3490 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
3491 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3492
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3493 if (run_hooks_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3494 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3495 if (! NILP (Vwindow_scroll_functions))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3496 run_hook_with_args_2 (Qwindow_scroll_functions, window,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3497 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
3498 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
3499 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3500
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3501 unbind_to (count, Qnil);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3502 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3503
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3504
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3505 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
3506 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
3507 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
3508 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
3509 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
3510 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
3511 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
3512
99160
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
3513 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
3514 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
3515 already display BUFFER-OR-NAME.
57031
0730ef55b4d8 (Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56616
diff changeset
3516
0730ef55b4d8 (Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56616
diff changeset
3517 This function runs the hook `window-scroll-functions'. */)
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3518 (window, buffer_or_name, keep_margins)
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3519 register Lisp_Object window, buffer_or_name, keep_margins;
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3520 {
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3521 register Lisp_Object tem, buffer;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3522 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3523
27848
27b993d2ea05 (Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents: 27699
diff changeset
3524 XSETWINDOW (window, w);
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3525 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
3526 CHECK_BUFFER (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3527 if (NILP (XBUFFER (buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3528 error ("Attempt to display deleted buffer");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3529
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3530 tem = w->buffer;
98884
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3531 if (NILP (tem))
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3532 error ("Window is deleted");
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3533 else if (!EQ (tem, Qt))
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3534 /* w->buffer is t when the window is first being set up. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3535 {
99142
ed258613edc7 (Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99120
diff changeset
3536 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
3537 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
3538 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
3539 else
ed258613edc7 (Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99120
diff changeset
3540 w->dedicated = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3541
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3542 unshow_buffer (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3543 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3544
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3545 set_window_buffer (window, buffer, 1, !NILP (keep_margins));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3546 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3547 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3548
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3549 /* 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
3550 Fset_window_configuration. */
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3551
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3552 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
3553 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
3554 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
3555 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
3556 Optional second arg NORECORD non-nil means do not put this buffer
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3557 at the front of the list of recently selected ones.
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3558
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3559 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
3560 selected window before each command. */)
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3561 (window, norecord)
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3562 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
3563 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3564 register struct window *w;
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3565 register struct window *ow;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3566 struct frame *sf;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3567
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3568 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3569
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3570 w = XWINDOW (window);
39953
3a1666ed16b8 (select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents: 39952
diff changeset
3571 w->frozen_window_start_p = 0;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3572
98176
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3573 if (NILP (norecord))
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3574 {
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3575 ++window_select_count;
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3576 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
3577 }
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3578
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3579 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3580 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3581
84758
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3582 sf = SELECTED_FRAME ();
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3583 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
3584 {
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3585 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
3586 /* 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
3587 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
3588 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
3589 frame is active. */
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3590 Fselect_frame (WINDOW_FRAME (w));
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3591 /* 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
3592 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
3593 return window;
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3594 }
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3595 else
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3596 sf->selected_window = window;
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3597
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3598 /* Store the current buffer's actual point into the
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3599 old selected window. It belongs to that window,
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3600 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
3601 if (!NILP (selected_window))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3602 {
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3603 ow = XWINDOW (selected_window);
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3604 if (! NILP (ow->buffer))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3605 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
3606 BUF_PT (XBUFFER (ow->buffer)),
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3607 BUF_PT_BYTE (XBUFFER (ow->buffer)));
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3608 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3609
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3610 selected_window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3611
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3612 if (NILP (norecord))
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3613 record_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3614 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3615
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
3616 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
3617
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3618 /* Go to the point recorded in the window.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3619 This is important when the buffer is in more
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3620 than one window. It also matters when
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3621 redisplay_window has altered point after scrolling,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3622 because it makes the change only in the window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3623 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624 register int new_point = marker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3625 if (new_point < BEGV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3626 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
3627 else if (new_point > ZV)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3628 SET_PT (ZV);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3629 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3630 SET_PT (new_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3631 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3632
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3633 windows_or_buffers_changed++;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3634 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3635 }
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3636
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3637 static Lisp_Object
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3638 select_window_norecord (window)
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3639 Lisp_Object window;
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3640 {
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3641 return Fselect_window (window, Qt);
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3642 }
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3643
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3644 Lisp_Object
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3645 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
3646 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
3647 {
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3648 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
3649 }
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3650
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3651 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
3652 0, 1, 0,
71717
dfc0eccac6a1 (Fforce_window_update): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 71396
diff changeset
3653 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
3654 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
3655 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
3656 displaying that buffer. */)
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3657 (object)
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3658 Lisp_Object object;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3659 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3660 if (NILP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3661 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3662 windows_or_buffers_changed++;
54178
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3663 update_mode_lines++;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3664 return Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3665 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3666
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3667 if (WINDOWP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3668 {
54178
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3669 struct window *w = XWINDOW (object);
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3670 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
3671 w->update_mode_line = Qt;
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3672 if (BUFFERP (w->buffer))
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3673 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
3674 ++update_mode_lines;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3675 return Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3676 }
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
3677
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3678 if (STRINGP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3679 object = Fget_buffer (object);
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3680 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
3681 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3682 /* 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
3683 of each of those windows. */
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3684
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3685 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
3686 return NILP (object) ? Qnil : Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3687 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3688
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3689 /* 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
3690 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
3691 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
3692 return Qnil;
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
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3695
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3696 void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3697 temp_output_buffer_show (buf)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3698 register Lisp_Object buf;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3699 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3700 register struct buffer *old = current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3701 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3702 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3703
18493
d65021d5c39e (temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 18065
diff changeset
3704 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
3705
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3706 Fset_buffer (buf);
10302
34556316a48a (temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 10043
diff changeset
3707 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3708 BEGV = BEG;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3709 ZV = Z;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3710 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
3711 #if 0 /* rms: there should be no reason for this. */
25375
919b568e4108 (Fset_window_hscroll): Set
Gerd Moellmann <gerd@gnu.org>
parents: 25356
diff changeset
3712 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
3713 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3714 set_buffer_internal (old);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3715
67234
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
3716 if (!NILP (Vtemp_buffer_show_function))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3717 call1 (Vtemp_buffer_show_function, buf);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3718 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3719 {
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3720 window = display_buffer (buf, Qnil, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3721
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3722 if (!EQ (XWINDOW (window)->frame, selected_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3723 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3724 Vminibuf_scroll_window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3725 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
3726 XSETFASTINT (w->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
3727 XSETFASTINT (w->min_hscroll, 0);
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3728 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
3729 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
3730
22149
ad3ee5ec90d1 (Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 21844
diff changeset
3731 /* 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
3732 and its buffer current. */
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3733
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3734 if (!NILP (Vrun_hooks)
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3735 && !NILP (Fboundp (Qtemp_buffer_show_hook))
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3736 && !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
3737 {
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3738 int count = SPECPDL_INDEX ();
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3739 Lisp_Object prev_window, prev_buffer;
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3740 prev_window = selected_window;
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3741 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
3742
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3743 /* 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
3744 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
3745 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
3746 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
3747 record_unwind_protect (Fset_buffer, prev_buffer);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3748 record_unwind_protect (select_window_norecord, prev_window);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3749 Fselect_window (window, Qt);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3750 Fset_buffer (w->buffer);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3751 call1 (Vrun_hooks, Qtemp_buffer_show_hook);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3752 unbind_to (count, Qnil);
11405
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3753 }
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3754 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3755 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
3757 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758 make_dummy_parent (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3759 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3760 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3761 Lisp_Object new;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3762 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
3763 int i;
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3764
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3765 o = XWINDOW (window);
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3766 p = allocate_window ();
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3767 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
3768 ((struct Lisp_Vector *) p)->contents[i]
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3769 = ((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
3770 XSETWINDOW (new, p);
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3771
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
3772 ++sequence_number;
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
3773 XSETFASTINT (p->sequence_number, sequence_number);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3774
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3775 /* Put new into window structure in place of window */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3776 replace_window (window, new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3777
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3778 o->next = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3779 o->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3780 o->vchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3781 o->hchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3782 o->parent = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3783
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3784 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3785 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3786 p->buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3787 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3788
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3789 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
3790 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
3791 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
3792 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
3793 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
3794 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
3795 Interactively, all arguments are nil.
8eb84bf840a8 (Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56174
diff changeset
3796 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
3797 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
3798 if it was selected before.
c53dfaf68575 (Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 71041
diff changeset
3799
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3800 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
3801 (window, size, horizontal)
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3802 Lisp_Object window, size, horizontal;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3803 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804 register Lisp_Object new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3805 register struct window *o, *p;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3806 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
3807 register int size_int;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3808
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3809 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3810 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3811 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3812 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3813
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3814 o = XWINDOW (window);
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3815 fo = XFRAME (WINDOW_FRAME (o));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3816
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3817 if (NILP (size))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3818 {
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3819 if (!NILP (horizontal))
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3820 /* 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
3821 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
3822 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
3823 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
3824 size_int = (XFASTINT (o->total_cols) + 1) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3825 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3826 size_int = XFASTINT (o->total_lines) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3830 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
3831 size_int = XINT (size);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3834 if (MINI_WINDOW_P (o))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3835 error ("Attempt to split minibuffer window");
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3836 else if (window_fixed_size_p (o, !NILP (horizontal), 0))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3837 error ("Attempt to split fixed-size window");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3838
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3839 if (NILP (horizontal))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3840 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3841 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
3842
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
3843 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
3844 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
3845 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
3846 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
3847 XFASTINT (o->total_lines) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3848 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3849 || NILP (XWINDOW (o->parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3850 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3851 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3852 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3853 XWINDOW (new)->vchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3854 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3855 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3856 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3858 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
3859
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
3860 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
3861 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
3862 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
3863 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
3864 XFASTINT (o->total_cols) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3865 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3866 || NILP (XWINDOW (o->parent)->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3867 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3868 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3869 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3870 XWINDOW (new)->hchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3871 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3872 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3873
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3874 /* Now we know that window's parent is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3875 if we are dividing vertically, or a horizontal combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3876 if we are making side-by-side windows */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3877
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3878 windows_or_buffers_changed++;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3879 FRAME_WINDOW_SIZES_CHANGED (fo) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3880 new = make_window ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3881 p = XWINDOW (new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3882
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3883 p->frame = o->frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3884 p->next = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3885 if (!NILP (p->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3886 XWINDOW (p->next)->prev = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3887 p->prev = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3888 o->next = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3889 p->parent = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3890 p->buffer = Qt;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3891 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3892 bzero (&p->last_cursor, sizeof p->last_cursor);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3894 /* Duplicate special geometry settings. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3895
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3896 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
3897 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
3898 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
3899 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
3900 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
3901 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
3902 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
3903
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3904 /* Apportion the available frame space among the two new windows */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3905
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3906 if (!NILP (horizontal))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3907 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3908 p->total_lines = o->total_lines;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3909 p->top_line = o->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3910 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
3911 XSETFASTINT (o->total_cols, size_int);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3912 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
3913 adjust_window_margins (p);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3914 adjust_window_margins (o);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3915 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3916 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3917 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3918 p->left_col = o->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3919 p->total_cols = o->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3920 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
3921 XSETFASTINT (o->total_lines, size_int);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3922 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3925 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3926 adjust_glyphs (fo);
51207
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 Fset_window_buffer (new, o->buffer, Qt);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3929 return new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3931
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
3932 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
3933 doc: /* Make selected window SIZE lines taller.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3934 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
3935 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
3936 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
3937 -SIZE lines or columns. Return nil.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3938
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3939 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
3940 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
3941 (size, horizontal)
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3942 Lisp_Object size, horizontal;
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3943 {
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3944 CHECK_NUMBER (size);
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3945 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
3946
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
3947 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
3948
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3949 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3950 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
3952 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
3953 doc: /* Make selected window SIZE lines smaller.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3954 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
3955 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
3956 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
3957 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
3958
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3959 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
3960 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
3961 (size, horizontal)
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3962 Lisp_Object size, horizontal;
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3963 {
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3964 CHECK_NUMBER (size);
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3965 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
3966
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
3967 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
3968
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3969 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3970 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3971
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3972 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3973 window_height (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3974 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3975 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3976 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
3977 return WINDOW_TOTAL_LINES (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3978 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3979
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3980 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3981 window_width (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3982 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3983 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3984 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
3985 return WINDOW_TOTAL_COLS (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3986 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3987
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3988
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3989 #define CURBEG(w) \
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
3990 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3991
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3992 #define CURSIZE(w) \
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
3993 *(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
3994
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
3995
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3996 /* 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
3997 horizontally; zero means do it vertically.
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
3998
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
3999 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
4000 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
4001 deleted. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4002
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4003 static void
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4004 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
4005 Lisp_Object window;
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4006 int delta, horiz_flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4007 {
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4008 Lisp_Object parent, next, prev;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4009 struct window *p;
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4010 Lisp_Object *sizep;
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4011 int maximum;
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
4012 int (*sizefun) P_ ((Lisp_Object))
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4013 = horiz_flag ? window_width : window_height;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4014 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
4015 = (horiz_flag ? set_window_width : set_window_height);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4016
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4017 /* 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
4018 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4019 error ("Window is not resizable");
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4020
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4021 /* Find the parent of the selected window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4022 while (1)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4023 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4024 p = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4025 parent = p->parent;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4026
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
4027 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4028 {
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4029 if (horiz_flag)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4030 error ("No other window to side of this one");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4031 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4032 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4033
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4034 if (horiz_flag
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4035 ? !NILP (XWINDOW (parent)->hchild)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
4036 : !NILP (XWINDOW (parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4037 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4038
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4039 window = parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4040 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4041
1049
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
4042 sizep = &CURSIZE (window);
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
4043
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4044 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4045 register int maxdelta;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4046
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4047 /* 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
4048
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4049 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4050 /* 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
4051 : !NILP (p->next) ? ((*sizefun) (p->next)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4052 - window_min_size (XWINDOW (p->next),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4053 horiz_flag, 0, 0, 0))
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4054 /* 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
4055 : !NILP (p->prev) ? ((*sizefun) (p->prev)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4056 - window_min_size (XWINDOW (p->prev),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4057 horiz_flag, 0, 0, 0))
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4058 /* 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
4059 or a minibufferless frame. */
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4060 : (delta = 0));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4061
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4062 if (delta > maxdelta)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4063 /* This case traps trying to make the minibuffer
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4064 the full frame, or make the only window aside from the
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4065 minibuffer the full frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4066 delta = maxdelta;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4067 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4068
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4069 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window),
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4070 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
4071 {
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
4072 delete_window (window);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
4073 return;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4074 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4075
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4076 if (delta == 0)
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4077 return;
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4078
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4079 /* 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
4080 maximum = 0;
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4081 for (next = p->next; WINDOWP (next); next = XWINDOW (next)->next)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4082 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4083 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
4084 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
4085 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4086 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
4087
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4088 /* 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
4089 if (delta <= maximum)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4090 {
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4091 Lisp_Object first_unaffected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4092 Lisp_Object first_affected;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4093 int fixed_p;
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4094
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4095 next = p->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4096 prev = p->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4097 first_affected = window;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4098 /* 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
4099 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
4100 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
4101 while (delta != 0
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4102 && (!NILP (next) || !NILP (prev)))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4103 {
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4104 if (! NILP (next))
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4105 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4106 int this_one = ((*sizefun) (next)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4107 - window_min_size (XWINDOW (next), horiz_flag,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4108 0, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4109 if (!fixed_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4110 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4111 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4112 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4113
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4114 (*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
4115 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4116
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4117 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4118 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4119
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4120 next = XWINDOW (next)->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4121 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4122
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4123 if (delta == 0)
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4124 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4125
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4126 if (! NILP (prev))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4127 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4128 int this_one = ((*sizefun) (prev)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4129 - window_min_size (XWINDOW (prev), horiz_flag,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4130 0, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4131 if (!fixed_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4132 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4133 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4134 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4135
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4136 first_affected = prev;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4137
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4138 (*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
4139 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4140
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4141 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4142 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4143
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4144 prev = XWINDOW (prev)->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4145 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4146 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4147
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4148 xassert (delta == 0);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4149
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4150 /* 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
4151 based on the new sizes. */
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4152 first_unaffected = next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4153 prev = first_affected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4154 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
4155 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
4156 {
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4157 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
4158 /* 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
4159 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
4160 (*setsizefun) (next, (*sizefun) (next), 0);
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4161 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4162 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4163 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4164 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4165 register int delta1;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4166 register int opht = (*sizefun) (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4167
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4168 if (opht <= XINT (*sizep) + delta)
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4169 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4170 /* 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
4171 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
4172 Lisp_Object start, tem, next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4173
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4174 start = XWINDOW (parent)->vchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4175 if (NILP (start))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4176 start = XWINDOW (parent)->hchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4177
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4178 /* 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
4179 tem = XWINDOW (window)->next;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4180 while (! NILP (tem))
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4181 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4182 next = XWINDOW (tem)->next;
42862
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4183 delete_window (tem);
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4184 tem = next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4185 }
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4186
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4187 /* 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
4188 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
4189 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
4190 tem = start;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4191 while (! EQ (tem, window))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4192 {
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4193 next = XWINDOW (tem)->next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4194 delete_window (tem);
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4195 tem = next;
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4196 }
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4197 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4198 else
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4199 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4200 /* Otherwise, make delta1 just right so that if we add
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4201 delta1 lines to this window and to the parent, and then
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4202 shrink the parent back to its original size, the new
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4203 proportional size of this window will increase by delta.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4204
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4205 The function size_window will compute the new height h'
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4206 of the window from delta1 as:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4207
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4208 e = delta1/n
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4209 x = delta1 - delta1/n * n for the 1st resizable child
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4210 h' = h + e + x
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4211
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4212 where n is the number of children that can be resized.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4213 We can ignore x by choosing a delta1 that is a multiple of
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4214 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
4215
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4216 h' = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4217
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4218 So, delta1 must be
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4219
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4220 h + e = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4221 delta1/n = delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4222 delta1 = n * delta.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4223
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
4224 The number of children n equals the number of resizable
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4225 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
4226 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
4227
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4228 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
4229 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
4230 use resize_proportionally to work around this problem. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4231
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4232 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4233 Lisp_Object s;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4234 int n = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4235
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4236 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
4237 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4238 ++n;
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4239 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
4240 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4241 ++n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4242
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4243 delta1 = n * delta;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4244
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4245 /* 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
4246 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
4247 XSETINT (CURSIZE (parent), opht + delta1);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4248 (*setsizefun) (window, XINT (*sizep) + delta1, 0);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4249
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4250 /* 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
4251 shrinking this window and siblings proportionately. This
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4252 brings parent back to correct size. Delta1 was calculated
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4253 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
4254 out of the siblings.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4255
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4256 Temporarily set resize_proportionally to Qt to assure that,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4257 if necessary, shrink_windows deletes smaller windows rather
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4258 than shrink this window. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4259 w->resize_proportionally = Qt;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4260 (*setsizefun) (parent, opht, 0);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4261 w->resize_proportionally = Qnil;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4262 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4263 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4264
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
4265 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
4266 XSETFASTINT (p->last_overlay_modified, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4267
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4268 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4269 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4270 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4271
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4272
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4273 /* 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
4274 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
4275 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
4276
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4277 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
4278 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
4279 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
4280
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4281 static void
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4282 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
4283 Lisp_Object window;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4284 int delta, horiz_flag;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4285 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4286 Lisp_Object parent, child;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4287 struct window *p;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4288 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
4289 int delcount = window_deletion_count;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4290
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4291 CHECK_WINDOW (window);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4292
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4293 /* 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
4294 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
4295 error ("Window is not resizable");
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4296
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4297 while (1)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4298 {
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4299 Lisp_Object first_parallel = Qnil;
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4300
71339
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4301 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
4302 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4303 /* 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
4304 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
4305 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
4306 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
4307 }
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4308
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4309 p = XWINDOW (window);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4310 parent = p->parent;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4311
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4312 /* 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
4313 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
4314 if (horiz_flag)
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4315 {
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4316 if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild))
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4317 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
4318 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
4319 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4320 /* 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
4321 which has no parent. */
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4322 first_parallel = window;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4323 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
4324 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
4325 }
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4326 }
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4327 else
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4328 {
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4329 if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild))
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4330 first_parallel = XWINDOW (parent)->hchild;
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4331 }
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 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
4334 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
4335 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
4336 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
4337 && 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
4338 {
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4339 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
4340 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
4341 }
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4342
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4343 /* Don't make this window too small. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4344 if (XINT (CURSIZE (window)) + delta
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4345 < 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
4346 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4347 Fset_window_configuration (old_config);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4348 error ("Cannot adjust window size as specified");
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4349 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4350
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4351 /* Clear out some redisplay caches. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4352 XSETFASTINT (p->last_modified, 0);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4353 XSETFASTINT (p->last_overlay_modified, 0);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4354
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4355 /* Adjust this window's edge. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4356 XSETINT (CURSIZE (window),
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4357 XINT (CURSIZE (window)) + delta);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4358
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4359 /* 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
4360 make them smaller, and exit the loop.
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4361
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4362 (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
4363 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
4364 if (NILP (first_parallel))
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4365 {
71339
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4366 if (!NILP (p->next))
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4367 {
68724
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4368 /* 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
4369 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
4370 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
4371 {
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4372 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
4373 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
4374 }
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4375
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4376 XSETINT (CURBEG (p->next),
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4377 XINT (CURBEG (p->next)) + delta);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4378 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
4379 horiz_flag, 0, 1, 0);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4380 break;
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 else
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4384 /* 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
4385 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
4386 for (child = first_parallel;
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4387 ! NILP (child);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4388 child = XWINDOW (child)->next)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4389 if (! EQ (child, window))
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4390 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
4391 horiz_flag, 0, 0, 1);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4392
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4393 window = parent;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4394 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4395
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4396 /* 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
4397 we failed. Report failure. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4398 if (delcount != window_deletion_count)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4399 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4400 Fset_window_configuration (old_config);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4401 error ("Cannot adjust window size as specified");
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4402 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4403
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4404 /* Adjust glyph matrices. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4405 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4406 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4407
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4408 #undef CURBEG
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4409 #undef CURSIZE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4410
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4411 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
4412 Sadjust_window_trailing_edge, 3, 3, 0,
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4413 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
4414 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
4415 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
4416
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4417 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
4418 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
4419 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
4420 (window, delta, horizontal)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4421 Lisp_Object window, delta, horizontal;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4422 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4423 CHECK_NUMBER (delta);
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4424 if (NILP (window))
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4425 window = selected_window;
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4426 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
4427
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4428 run_window_configuration_change_hook
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4429 (XFRAME (WINDOW_FRAME (XWINDOW (window))));
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4430
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4431 return Qnil;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4432 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4433
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4434
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4435
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4436 /***********************************************************************
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4437 Resizing Mini-Windows
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4438 ***********************************************************************/
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4439
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4440 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
4441
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4442 enum save_restore_action
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4443 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4444 CHECK_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4445 SAVE_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4446 RESTORE_ORIG_SIZES
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4447 };
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4448
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4449 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
4450 enum save_restore_action));
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4451
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4452 /* 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
4453 from lowest windows first. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4454
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4455 static void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4456 shrink_window_lowest_first (w, height)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4457 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4458 int height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4459 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4460 struct window *c;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4461 Lisp_Object child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4462 int old_height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4463
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4464 xassert (!MINI_WINDOW_P (w));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4465
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4466 /* Set redisplay hints. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4467 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4468 XSETFASTINT (w->last_overlay_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4469 windows_or_buffers_changed++;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4470 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
4471
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4472 old_height = XFASTINT (w->total_lines);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4473 XSETFASTINT (w->total_lines, height);
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4474
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4475 if (!NILP (w->hchild))
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4476 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4477 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
4478 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4479 c = XWINDOW (child);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4480 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
4481 shrink_window_lowest_first (c, height);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4482 }
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 else if (!NILP (w->vchild))
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4485 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4486 Lisp_Object last_child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4487 int delta = old_height - height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4488 int last_top;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4489
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4490 last_child = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4491
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4492 /* 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
4493 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
4494 backwards. */
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4495 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
4496 last_child = child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4497
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4498 /* 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
4499 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
4500 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4501 int this_one;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4502
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4503 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4504 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
4505
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4506 if (this_one > delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4507 this_one = delta;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4508
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4509 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
4510 delta -= this_one;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4511 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4512
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4513 /* Compute new positions. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4514 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
4515 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
4516 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4517 c = XWINDOW (child);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4518 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
4519 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
4520 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
4521 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4522 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4523 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4524
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4525
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4526 /* 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
4527 rooted at W. ACTION says what to do.
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4528
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4529 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
4530 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
4531 tree. Value is non-zero if they are valid.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4532
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4533 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
4534 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
4535
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4536 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
4537 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
4538
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4539 static int
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4540 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
4541 struct window *w;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4542 enum save_restore_action action;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4543 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4544 int success_p = 1;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4545
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4546 while (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4547 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4548 if (!NILP (w->hchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4549 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4550 if (!save_restore_orig_size (XWINDOW (w->hchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4551 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4552 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4553 else if (!NILP (w->vchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4554 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4555 if (!save_restore_orig_size (XWINDOW (w->vchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4556 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4557 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4558
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4559 switch (action)
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4560 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4561 case CHECK_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4562 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
4563 return 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4564 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4565
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4566 case SAVE_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4567 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
4568 w->orig_total_lines = w->total_lines;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4569 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4570 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4571 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4572
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4573 case RESTORE_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4574 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
4575 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
4576 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
4577 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
4578 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4579 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4580 break;
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 default:
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4583 abort ();
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4584 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4585
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4586 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
4587 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4588
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4589 return success_p;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4590 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4591
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4592
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4593 /* 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
4594 without deleting other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4595
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4596 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4597 grow_mini_window (w, delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4598 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4599 int delta;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4600 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4601 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4602 struct window *root;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4603
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4604 xassert (MINI_WINDOW_P (w));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4605 xassert (delta >= 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4606
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4607 /* 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
4608 other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4609 root = XWINDOW (FRAME_ROOT_WINDOW (f));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4610 if (delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4611 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4612 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
4613 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
4614 /* 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
4615 min_height. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4616 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
4617 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4618
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4619 if (delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4620 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4621 /* 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
4622 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4623 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
4624
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4625 /* Shrink other windows. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4626 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
4627
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4628 /* Grow the mini-window. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4629 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
4630 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
4631 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4632 XSETFASTINT (w->last_overlay_modified, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4633
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4634 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4635 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4636 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4637
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4638
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4639 /* 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
4640 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
4641 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
4642 line. */
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4643
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4644 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4645 shrink_mini_window (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4646 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4647 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4648 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4649 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
4650
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4651 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
4652 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4653 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
4654 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4655 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4656 windows_or_buffers_changed = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4657 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4658 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
4659 {
35621
5f154b8fc2bd (size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents: 35483
diff changeset
4660 /* 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
4661 among the other windows. */
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4662 Lisp_Object window;
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4663 XSETWINDOW (window, w);
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4664 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
4665 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4666 }
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
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4670 /* 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
4671 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
4672 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
4673 the frame are cleared. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4674
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4675 void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4676 mark_window_cursors_off (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4677 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4678 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4679 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4680 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4681 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4682 mark_window_cursors_off (XWINDOW (w->hchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4683 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4684 mark_window_cursors_off (XWINDOW (w->vchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4685 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4686 w->phys_cursor_on_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4687
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4688 w = NILP (w->next) ? 0 : XWINDOW (w->next);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4689 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4690 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4691
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4692
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4693 /* Return number of lines of text (not counting mode lines) in W. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4694
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4695 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4696 window_internal_height (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4697 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4698 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4699 int ht = XFASTINT (w->total_lines);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4700
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4701 if (!MINI_WINDOW_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4702 {
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4703 if (!NILP (w->parent)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4704 || !NILP (w->vchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4705 || !NILP (w->hchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4706 || !NILP (w->next)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4707 || !NILP (w->prev)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4708 || WINDOW_WANTS_MODELINE_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4709 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4710
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4711 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
4712 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4713 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4714
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4715 return ht;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4716 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4717
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4718
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4719 /* 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
4720 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
4721 separating W from the sibling to its right. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4722
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4723 int
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4724 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
4725 struct window *w;
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4726 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4727 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
4728 int width = XINT (w->total_cols);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4729
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4730 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4731 /* 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
4732 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
4733 else if (!FRAME_WINDOW_P (f)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4734 && !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
4735 /* The column of `|' characters separating side-by-side windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4736 occupies one column only. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4737 width -= 1;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4738
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4739 if (FRAME_WINDOW_P (f))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4740 /* 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
4741 used for normal text. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4742 width -= (WINDOW_FRINGE_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4743 + WINDOW_LEFT_MARGIN_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4744 + 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
4745
701db778b7a4 (Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents: 16208
diff changeset
4746 return width;
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4747 }
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4748
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4749
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4750 /************************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4751 Window Scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4752 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4753
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4754 /* 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
4755 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
4756 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
4757 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
4758 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
4759 respectively. */
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4760
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4761 static void
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4762 window_scroll (window, n, whole, noerror)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4763 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4764 int n;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4765 int whole;
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
4766 int noerror;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4767 {
47865
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4768 immediate_quit = 1;
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4769
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4770 /* 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
4771 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
4772 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame)))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4773 window_scroll_pixel_based (window, n, whole, noerror);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4774 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4775 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
4776
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4777 immediate_quit = 0;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4778 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4779
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4780
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4781 /* 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
4782 heights. See the comment of window_scroll for parameter
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4783 descriptions. */
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 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4786 window_scroll_pixel_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4787 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4788 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4789 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4790 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4791 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4792 struct it it;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4793 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4794 struct text_pos start;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4795 int this_scroll_margin;
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
4796 /* 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
4797 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
4798 int x, y, rtop, rbot, rowh, vpos;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4799
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4800 SET_TEXT_POS_FROM_MARKER (start, w->start);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4801
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4802 /* 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
4803 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
4804 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
4805 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
4806
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4807 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
4808 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4809 /* 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
4810 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
4811 results for variable height lines. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4812 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
4813 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
4814 move_it_vertically_backward (&it, window_box_height (w) / 2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4815
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4816 /* 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
4817 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
4818 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
4819 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
4820 start of the line containing PT in this case. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4821 if (it.current_y <= 0)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4822 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4823 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
4824 move_it_vertically_backward (&it, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4825 it.current_y = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4826 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4827
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4828 start = it.current.pos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4829 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4830 else if (auto_window_vscroll_p)
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4831 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4832 if (rtop || rbot) /* partially visible */
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4833 {
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4834 int px;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4835 int dy = WINDOW_FRAME_LINE_HEIGHT (w);
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4836 if (whole)
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4837 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
4838 - 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
4839 dy);
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4840 dy *= n;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4841
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4842 if (n < 0)
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4843 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4844 /* 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
4845 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
4846 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4847 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
4848 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
4849 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4850 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4851 }
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4852 if (n > 0)
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4853 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4854 /* 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
4855 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
4856 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4857 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
4858 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
4859 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4860 }
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4861
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4862 /* 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
4863 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
4864 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4865 int spos;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4866
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4867 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
4868 /* 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
4869 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
4870 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
4871 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
4872 else
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4873 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
4874 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
4875 w->buffer);
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4876 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
4877 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
4878 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
4879 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
4880 /* 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
4881 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
4882 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
4883 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4884 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4885 }
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4886 }
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4887 /* Cancel previous vscroll. */
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4888 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
4889 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4890
58083
49b5dabf0ccc Fix commentary.
Kim F. Storm <storm@cua.dk>
parents: 57898
diff changeset
4891 /* 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
4892 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
4893 if (!NILP (Vscroll_preserve_screen_position))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4894 {
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4895 /* 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
4896 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
4897 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
4898 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
4899 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
4900 || (!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
4901 && !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
4902 {
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4903 start_display (&it, w, start);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4904 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
4905 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
4906 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
4907 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4908 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4909 else
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
4910 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
4911 = window_scroll_pixel_based_preserve_x = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4912
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4913 /* 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
4914 backward. The result is the new window start. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4915 start_display (&it, w, start);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4916 if (whole)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4917 {
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4918 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
4919 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
4920 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
4921 - 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
4922 dy) * n;
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4923
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4924 /* 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
4925 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
4926 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
4927 if (dy <= 0)
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4928 {
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4929 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
4930 /* 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
4931 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
4932 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
4933 && start_pos > BEGV)
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4934 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
4935 }
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4936 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
4937 {
75b50deae4e9 (window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents: 59677
diff changeset
4938 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
4939 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
4940 /* 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
4941 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
4942 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
4943 && start_pos < ZV)
75b50deae4e9 (window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents: 59677
diff changeset
4944 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
4945 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4946 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4947 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4948 move_it_by_lines (&it, n, 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4949
49011
594a08370cb3 (window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents: 48945
diff changeset
4950 /* 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
4951 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
4952 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
4953 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
4954 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start)))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4955 {
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4956 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
4957 {
48945
a96801f68a82 (window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents: 48927
diff changeset
4958 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
4959 && (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
4960 > it.last_visible_y))
35126
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4961 {
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4962 /* 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
4963 visible. */
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4964 w->vscroll = (it.last_visible_y
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4965 - 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
4966 adjust_glyphs (it.f);
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4967 }
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4968 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4969 return;
71286
1d2d52a04520 (window_scroll_pixel_based): Signal "Beginning of buffer" when scroll-down
Eli Zaretskii <eliz@gnu.org>
parents: 71146
diff changeset
4970 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
4971 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
4972 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
4973 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
4974 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4975 else
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4976 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4977 if (w->vscroll != 0)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4978 /* 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
4979 visible. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4980 w->vscroll = 0;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4981 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4982 return;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4983 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
4984 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
4985 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4986
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4987 /* 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
4988
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4989 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
4990
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4991 /* 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
4992 vscrolled = 1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4993 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4994
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4995 if (! vscrolled)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4996 {
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4997 int pos = IT_CHARPOS (it);
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4998 int bytepos;
49836
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
4999
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5000 /* 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
5001 the next character. */
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5002 if (in_display_vector_p (&it))
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5003 {
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5004 ++pos;
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5005 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
5006 }
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5007
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5008 /* 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
5009 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
5010 w->buffer);
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5011 bytepos = XMARKER (w->start)->bytepos;
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5012 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
5013 ? Qt : Qnil);
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5014 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
5015 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
5016 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
5017 /* 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
5018 window-scroll-functions. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5019 w->force_start = Qt;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5020 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5021
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5022 /* 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
5023 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
5024 it.current_y = it.vpos = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5025
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5026 /* Move PT out of scroll margins.
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5027 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
5028 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
5029 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
5030 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
5031 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
5032
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5033 if (n > 0)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5034 {
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5035 /* 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
5036 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
5037 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
5038 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
5039 && (NILP (Vscroll_preserve_screen_position)
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5040 || 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
5041 /* 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
5042 ;
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5043 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
5044 {
59342
132e8f3a36a1 (window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents: 59258
diff changeset
5045 /* 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
5046 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
5047 move_it_to (&it, -1,
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5048 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
5049 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
5050 - (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
5051 -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
5052 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
5053 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5054 else
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5055 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5056 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
5057 {
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
5058 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
5059 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
5060 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
5061 break;
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
5062 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5063 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5064 }
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5065 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5066 else if (n < 0)
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5067 {
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5068 int charpos, bytepos;
60198
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5069 int partial_p;
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5070
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5071 /* 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
5072 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
5073 charpos = IT_CHARPOS (it);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5074 bytepos = IT_BYTEPOS (it);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5075
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5076 /* 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
5077 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
5078 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
5079 (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
5080 - 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
5081 -1,
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5082 MOVE_TO_POS | MOVE_TO_Y);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5083
60198
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5084 /* 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
5085 charpos = IT_CHARPOS (it);
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5086 bytepos = IT_BYTEPOS (it);
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5087
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5088 /* 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
5089 if (it.what == IT_EOB)
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5090 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
5091 else
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5092 {
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5093 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
5094 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
5095 }
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5096
63865
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5097 if (charpos == PT && !partial_p
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5098 && (NILP (Vscroll_preserve_screen_position)
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5099 || 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
5100 /* 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
5101 ;
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5102 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
5103 {
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5104 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
5105 start_display (&it, w, start);
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
5106 /* 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
5107 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
5108 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
5109 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
5110 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
5111 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
5112 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
5113 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5114 else
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 if (partial_p)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5117 /* 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
5118 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
5119 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5120 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
5121 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
5122 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5123 else
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5124 /* 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
5125 SET_PT_BOTH (charpos, bytepos);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5126 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5127 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5128 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5129
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5130
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5131 /* 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
5132 See the comment of window_scroll for parameter descriptions. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5133
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5134 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5135 window_scroll_line_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5136 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5137 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5138 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5139 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5140 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5141 register struct window *w = XWINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5142 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
5143 register int pos, pos_byte;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5144 register int ht = window_internal_height (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5145 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5146 int lose;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5147 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
5148 int startpos;
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5149 Lisp_Object original_pos = Qnil;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5150
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5151 /* 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
5152 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
5153 if (whole)
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5154 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
5155
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5156 startpos = marker_position (w->start);
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5157
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5158 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
5159 {
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5160 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
5161 || (!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
5162 && !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
5163 {
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5164 struct position posit
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5165 = *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
5166 PT, ht, 0,
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5167 -1, XINT (w->hscroll),
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5168 0, w);
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5169 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
5170 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
5171 }
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5172
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5173 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
5174 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
5175 }
13102
960db92441d8 (window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents: 12981
diff changeset
5176
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
5177 XSETFASTINT (tem, PT);
32773
a7fdbf39d4de (window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents: 32752
diff changeset
5178 tem = Fpos_visible_in_window_p (tem, window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5179
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5180 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5181 {
6341
dfc758dd2b08 (window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents: 6326
diff changeset
5182 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
5183 startpos = PT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5184 }
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
5185
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
5186 SET_PT (startpos);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5187 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
5188 Fvertical_motion (make_number (n), window);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5189 pos = PT;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5190 pos_byte = PT_BYTE;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5191 bolp = Fbolp ();
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5192 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5193
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5194 if (lose)
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5195 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5196 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5197 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5198 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5199 xsignal0 (Qbeginning_of_buffer);
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5200 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5201
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5202 if (pos < ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5203 {
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5204 int this_scroll_margin = scroll_margin;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5205
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5206 /* 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
5207 if (this_scroll_margin < 0)
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5208 this_scroll_margin = 0;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5209
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5210 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
5211 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
5212
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5213 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5214 w->start_at_line_beg = bolp;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5215 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
5216 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
5217 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
5218 /* 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
5219 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
5220 w->force_start = Qt;
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5221
63865
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5222 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
5223 && (whole || !EQ (Vscroll_preserve_screen_position, Qt)))
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5224 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5225 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
5226 Fvertical_motion (original_pos, window);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5227 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5228 /* 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
5229 that it is outside the scroll margin. */
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5230 else if (n > 0)
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5231 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5232 int top_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5233
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5234 if (this_scroll_margin > 0)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5235 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5236 SET_PT_BOTH (pos, pos_byte);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5237 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
5238 top_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5239 }
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5240 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5241 top_margin = pos;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5242
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5243 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
5244 SET_PT_BOTH (opoint, opoint_byte);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5245 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
5246 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5247 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
5248 Fvertical_motion (original_pos, window);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5249 }
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5250 else
20046
8baac8399a29 (window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents: 19667
diff changeset
5251 SET_PT (top_margin);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5252 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5253 else if (n < 0)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5254 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5255 int bottom_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5256
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5257 /* 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
5258 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
5259 SET_PT_BOTH (pos, pos_byte);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5260 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
5261 if (XFASTINT (tem) == ht - this_scroll_margin)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5262 bottom_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5263 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5264 bottom_margin = PT + 1;
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 (bottom_margin > opoint)
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5267 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5268 else
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5269 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5270 if (!NILP (Vscroll_preserve_screen_position))
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5271 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5272 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
5273 Fvertical_motion (original_pos, window);
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5274 }
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5275 else
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5276 Fvertical_motion (make_number (-1), window);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5277 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5278 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5279 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5280 else
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5281 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5282 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5283 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5284 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5285 xsignal0 (Qend_of_buffer);
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5286 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5287 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5288
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5289
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5290 /* 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
5291 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
5292 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
5293 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
5294 up. This is the guts of Fscroll_up and Fscroll_down. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5295
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5296 static void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5297 scroll_command (n, direction)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5298 Lisp_Object n;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5299 int direction;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5300 {
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5301 int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5302
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
5303 xassert (eabs (direction) == 1);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5304
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5305 /* 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
5306 the moment. But don't screw up if window_scroll gets an error. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5307 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5308 {
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5309 record_unwind_protect (save_excursion_restore, save_excursion_save ());
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5310 Fset_buffer (XWINDOW (selected_window)->buffer);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5311
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5312 /* Make redisplay consider other windows than just selected_window. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5313 ++windows_or_buffers_changed;
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5314 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5315
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5316 if (NILP (n))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5317 window_scroll (selected_window, direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5318 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
5319 window_scroll (selected_window, -direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5320 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5321 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5322 n = Fprefix_numeric_value (n);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5323 window_scroll (selected_window, XINT (n) * direction, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5324 }
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5325
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5326 unbind_to (count, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5327 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5328
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5329 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
5330 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
5331 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
5332 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
5333 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
5334 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
5335 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
5336 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5337 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5338 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5339 scroll_command (arg, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5340 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5341 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5342
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5343 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
5344 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
5345 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
5346 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
5347 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
5348 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
5349 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
5350 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5351 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5352 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5353 scroll_command (arg, -1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5354 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5355 }
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5356
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5357 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
5358 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
5359 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
5360 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
5361 If in the minibuffer, `minibuffer-scroll-window' if non-nil
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
5362 specifies the window. This takes precedence over
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
5363 `other-window-scroll-buffer'. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5364 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5365 {
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5366 Lisp_Object window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368 if (MINI_WINDOW_P (XWINDOW (selected_window))
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5369 && !NILP (Vminibuf_scroll_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5370 window = Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5371 /* If buffer is specified, scroll that buffer. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5372 else if (!NILP (Vother_window_scroll_buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5373 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5374 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5375 if (NILP (window))
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
5376 window = display_buffer (Vother_window_scroll_buffer, Qt, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5377 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5378 else
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5379 {
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5380 /* 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
5381 frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5382 window = Fnext_window (selected_window, Qnil, Qnil);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5383
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5384 if (EQ (window, selected_window))
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5385 /* 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
5386 visible frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5387 do
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5388 window = Fnext_window (window, Qnil, Qt);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5389 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
5390 && ! EQ (window, selected_window));
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5391 }
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5392
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5393 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5394
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5395 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5396 error ("There is no other window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5397
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5398 return window;
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5399 }
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5400
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5401 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
5402 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
5403 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
5404 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
5405 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
5406 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
5407 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
5408
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
5409 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
5410 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
5411 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
5412 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
5413 `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
5414 (arg)
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5415 Lisp_Object arg;
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5416 {
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5417 Lisp_Object window;
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5418 struct window *w;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5419 int count = SPECPDL_INDEX ();
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5420
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5421 window = Fother_window_for_scrolling ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5422 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5423
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5424 /* Don't screw up if window_scroll gets an error. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5425 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
5426 ++windows_or_buffers_changed;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5427
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5428 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5429 SET_PT (marker_position (w->pointm));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5430
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5431 if (NILP (arg))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5432 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
5433 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
5434 window_scroll (window, -1, 1, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5435 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5436 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5437 if (CONSP (arg))
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5438 arg = Fcar (arg);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5439 CHECK_NUMBER (arg);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5440 window_scroll (window, XINT (arg), 0, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5441 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5442
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5443 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
5444 unbind_to (count, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5445
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5446 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5447 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5448
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5449 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
5450 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
5451 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5452 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
5453 effect after the change.
99189
dc2662d377a4 * window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents: 99160
diff changeset
5454 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
5455 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
5456 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
5457 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
5458 (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
5459 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5460 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5461 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5462 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5463 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5464
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5465 if (NILP (arg))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5466 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5467 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5468 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5469
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5470 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
5471 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
5472
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5473 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
5474 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
5475
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5476 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5477 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5478
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5479 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
5480 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
5481 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5482 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
5483 effect after the change.
99189
dc2662d377a4 * window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents: 99160
diff changeset
5484 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
5485 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
5486 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
5487 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
5488 (arg, set_minimum)
57898
f85e0cc87926 (Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 57874
diff changeset
5489 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5490 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5491 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5492 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5493 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5494
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5495 if (NILP (arg))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5496 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5497 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5498 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5499
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5500 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
5501 result = Fset_window_hscroll (selected_window, make_number (hscroll));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5502
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5503 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
5504 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
5505
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5506 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5507 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5508
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5509 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
5510 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
5511 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
5512 ()
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5513 {
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5514 if (minibuf_level > 0
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5515 && MINI_WINDOW_P (XWINDOW (selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5516 && WINDOW_LIVE_P (minibuf_selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5517 return minibuf_selected_window;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5518
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5519 return Qnil;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5520 }
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5521
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5522 /* 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
5523 as opposed to its height. */
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5524
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5525 static int
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5526 displayed_window_lines (w)
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5527 struct window *w;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5528 {
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5529 struct it it;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5530 struct text_pos start;
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5531 int height = window_box_height (w);
33059
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5532 struct buffer *old_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5533 int bottom_y;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5534
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5535 if (XBUFFER (w->buffer) != current_buffer)
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5536 {
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5537 old_buffer = current_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5538 set_buffer_internal (XBUFFER (w->buffer));
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5539 }
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5540 else
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5541 old_buffer = NULL;
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5542
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5543 /* 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
5544 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
5545 calls (recenter -1) while W->start is 1. */
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5546 if (XMARKER (w->start)->charpos < BEGV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5547 SET_TEXT_POS (start, BEGV, BEGV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5548 else if (XMARKER (w->start)->charpos > ZV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5549 SET_TEXT_POS (start, ZV, ZV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5550 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5551 SET_TEXT_POS_FROM_MARKER (start, w->start);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5552
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5553 start_display (&it, w, start);
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5554 move_it_vertically (&it, height);
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5555 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
5556
47234
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5557 /* 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
5558 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
5559 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
5560 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
5561 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
5562 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
5563 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
5564 height++;
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5565
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5566 /* 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
5567 if (bottom_y < height)
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5568 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5569 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
5570 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
5571 }
34384
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5572
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5573 if (old_buffer)
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5574 set_buffer_internal (old_buffer);
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5575
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5576 return it.vpos;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5577 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5578
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5579
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5580 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P",
99034
a63f6def7577 (Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98884
diff changeset
5581 doc: /* Center point in selected window and redisplay frame.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5582 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
5583 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
5584 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
5585
74966
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5586 If ARG is omitted or nil, erase the entire frame and then redraw with point
99034
a63f6def7577 (Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98884
diff changeset
5587 in the center of the selected window. If `auto-resize-tool-bars' is set to
74966
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5588 `grow-only', this resets the tool-bar's height to the minimum height needed.
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5589
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5590 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
5591 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
5592 (arg)
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5593 register Lisp_Object arg;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5594 {
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5595 struct window *w = XWINDOW (selected_window);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5596 struct buffer *buf = XBUFFER (w->buffer);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5597 struct buffer *obuf = current_buffer;
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5598 int center_p = 0;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5599 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
5600 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
5601 int this_scroll_margin;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5602
42089
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5603 /* 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
5604 obuf->display_error_modiff = 0;
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5605
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5606 if (NILP (arg))
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5607 {
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5608 int i;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5609
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5610 /* Invalidate pixel data calculated for all compositions. */
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5611 for (i = 0; i < n_compositions; i++)
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5612 composition_table[i]->font = NULL;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5613
74966
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5614 WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1;
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5615
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5616 Fredraw_frame (WINDOW_FRAME (w));
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5617 SET_FRAME_GARBAGED (WINDOW_XFRAME (w));
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5618 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5619 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5620 else if (CONSP (arg)) /* Just C-u. */
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5621 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5622 else
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5623 {
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5624 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
5625 CHECK_NUMBER (arg);
64133
7e06f331c228 (Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents: 64114
diff changeset
5626 iarg = XINT (arg);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5627 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5628
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5629 set_buffer_internal (buf);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5630
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
5631 /* 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
5632 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
5633 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
5634 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
5635 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
5636
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5637 /* 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
5638 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
5639 line counts would lead to strange effects. */
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5640 if (FRAME_WINDOW_P (XFRAME (w->frame)))
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5641 {
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5642 if (center_p)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5643 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5644 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5645 struct text_pos pt;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5646
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5647 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5648 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5649 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
5650 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5651 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5652 }
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
5653 else if (iarg < 0)
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5654 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5655 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5656 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
5657 int nlines = -iarg;
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5658 int extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5659 int h = window_box_height (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5660
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
5661 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
5662
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5663 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5664 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5665
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5666 /* 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
5667 move_it_by_lines (&it, 0, 1);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5668
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5669 /* 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
5670 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
5671 and the lines below. */
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5672 it.current_y = 0;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5673 it.vpos = 0;
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5674 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
5675
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5676 if (it.vpos == nlines)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5677 h -= it.current_y;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5678 else
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5679 {
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5680 /* Last line has no newline */
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5681 h -= line_bottom_y (&it);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5682 it.vpos++;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5683 }
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5684
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5685 /* 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
5686 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
5687
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5688 /* 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
5689 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
5690 if (it.vpos < nlines)
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5691 {
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5692 nlines -= it.vpos;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5693 extra_line_spacing = it.extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5694 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
5695 }
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5696 if (h <= 0)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5697 return Qnil;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5698
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5699 /* 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
5700 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5701 it.current_y = 0;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5702 move_it_vertically_backward (&it, h);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5703
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5704 /* 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
5705 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
5706 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
5707 in the middle), so move forward.
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5708 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
5709 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
5710 */
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5711 h += extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5712 while (-it.current_y > h)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5713 move_it_by_lines (&it, 1, 1);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5714
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5715 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5716 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5717 }
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5718 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5719 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5720 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
5721
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
5722 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
5723
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
5724 pos = *vmotion (PT, -iarg, w);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5725 charpos = pos.bufpos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5726 bytepos = pos.bytepos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5727 }
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5728 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5729 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5730 {
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5731 struct position pos;
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5732 int ht = window_internal_height (w);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5733
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5734 if (center_p)
64236
667d6d6c7fd9 (Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64134
diff changeset
5735 iarg = ht / 2;
64134
0fcb7f3236c9 (Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents: 64133
diff changeset
5736 else if (iarg < 0)
0fcb7f3236c9 (Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents: 64133
diff changeset
5737 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
5738
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
5739 /* 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
5740 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
5741 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
5742
51f6009d047b (Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
5743 pos = *vmotion (PT, - iarg, w);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5744 charpos = pos.bufpos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5745 bytepos = pos.bytepos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5746 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5747
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5748 /* Set the new window start. */
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5749 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
5750 w->window_end_valid = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5751
46108
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5752 w->optional_new_start = Qt;
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5753
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5754 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
5755 w->start_at_line_beg = Qt;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5756 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5757 w->start_at_line_beg = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5758
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5759 set_buffer_internal (obuf);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5760 return Qnil;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5761 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5762
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5763
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5764 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
5765 0, 1, 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5766 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
5767 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
5768 This doesn't include the mode-line (or header-line if any) or any
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5769 partial-height lines in the text display area. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5770 (window)
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5771 Lisp_Object window;
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5772 {
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5773 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
5774 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
5775 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
5776 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
5777 }
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5778
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5779
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5780
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5781 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
5782 1, 1, "P",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5783 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
5784 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
5785 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
5786 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
5787 (arg)
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5788 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5789 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5790 struct window *w = XWINDOW (selected_window);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5791 int lines, start;
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5792 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
5793 #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
5794 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
5795 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5796
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5797 window = selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5798 start = marker_position (w->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5799 if (start < BEGV || start > ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5800 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5801 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
5802 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
5803 set_marker_both (w->start, w->buffer, PT, PT_BYTE);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5804 w->start_at_line_beg = Fbolp ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5805 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5806 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5807 else
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5808 Fgoto_char (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5809
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5810 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
5811
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
5812 #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
5813 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
5814 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
5815 #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
5816
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5817 if (NILP (arg))
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5818 XSETFASTINT (arg, lines / 2);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5819 else
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5820 {
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
5821 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
5822
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
5823 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
5824 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
5825
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
5826 #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
5827 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
5828 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
5829 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
5830 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
5831
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
5832 /* 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
5833 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
5834 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
5835 #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
5836
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 arg = make_number (iarg);
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5838 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5839
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5840 /* 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
5841 if (w->vscroll)
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5842 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
5843
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5844 return Fvertical_motion (arg, window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5845 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5846
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5847
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5848
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5849 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5850 Window Configuration
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5851 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5852
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5853 struct save_window_data
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5854 {
85022
96eb42c9e0e3 * window.h (struct window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85013
diff changeset
5855 EMACS_UINT size;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5856 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
5857 Lisp_Object selected_frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5858 Lisp_Object current_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5859 Lisp_Object current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5860 Lisp_Object minibuf_scroll_window;
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
5861 Lisp_Object minibuf_selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5862 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
5863 Lisp_Object focus_frame;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5864 /* 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
5865 for one window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5866 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
5867
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
5868 /* 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
5869 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
5870
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
5871 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
5872 int frame_tool_bar_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5873 };
1326
709532b86646 * window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents: 1325
diff changeset
5874
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5875 /* This is saved as a Lisp_Vector */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5876 struct saved_window
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5877 {
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5878 /* 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
5879 EMACS_UINT size;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5880 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
5881
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5882 Lisp_Object window;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5883 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
5884 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
5885 Lisp_Object hscroll, min_hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5886 Lisp_Object parent, prev;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5887 Lisp_Object start_at_line_beg;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5888 Lisp_Object display_table;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5889 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
5890 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
5891 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
5892 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
5893 Lisp_Object dedicated, resize_proportionally;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5894 };
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5895
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5896 #define SAVED_WINDOW_N(swv,n) \
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5897 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)])))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5898
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5899 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
5900 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
5901 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5902 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5903 {
71041
8aeb086972ae (struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70736
diff changeset
5904 return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5905 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5906
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5907 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
5908 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
5909 (config)
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5910 Lisp_Object config;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5911 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5912 register struct save_window_data *data;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5913 struct Lisp_Vector *saved_windows;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5914
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
5915 CHECK_WINDOW_CONFIGURATION (config);
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5916
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5917 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
5918 saved_windows = XVECTOR (data->saved_windows);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5919 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
5920 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5921
2297
bb88d48c290f (Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents: 2210
diff changeset
5922 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
5923 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
5924 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
5925 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
5926 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
5927 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
5928 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
5929 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
5930 (configuration)
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
5931 Lisp_Object configuration;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5932 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5933 register struct save_window_data *data;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5934 struct Lisp_Vector *saved_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5935 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
5936 Lisp_Object frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
5937 FRAME_PTR f;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
5938 int old_point = -1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5939
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
5940 CHECK_WINDOW_CONFIGURATION (configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5941
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
5942 data = (struct save_window_data *) XVECTOR (configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5943 saved_windows = XVECTOR (data->saved_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5944
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5945 new_current_buffer = data->current_buffer;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5946 if (NILP (XBUFFER (new_current_buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5947 new_current_buffer = Qnil;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
5948 else
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5949 {
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5950 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
5951 /* 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
5952 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
5953 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
5954 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
5955 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
5956 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
5957 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
5958 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
5959 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
5960 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
5961 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
5962 && WINDOWP (selected_window)
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
5963 && 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
5964 && !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
5965 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
5966 else
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
5967 old_point = PT;
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5968 else
61511
db63a29e7669 (Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61444
diff changeset
5969 /* 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
5970 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
5971 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
5972 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
5973 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
5974 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
5975 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
5976 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
5977 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
5978 /* 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
5979 && !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
5980 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
5981 else
db63a29e7669 (Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61444
diff changeset
5982 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
5983 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5984
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5985 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
5986 f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5987
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5988 /* 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
5989 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
5990 if (FRAME_LIVE_P (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5991 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5992 register struct window *w;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5993 register struct saved_window *p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5994 struct window *root_window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5995 struct window **leaf_windows;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5996 int n_leaf_windows;
33277
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
5997 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
5998
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5999 /* 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
6000 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
6001 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
6002 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
6003 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
6004 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
6005 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
6006 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
6007
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6008 /* The mouse highlighting code could get screwed up
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6009 if it runs during this. */
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6010 BLOCK_INPUT;
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6011
86162
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
6012 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
6013 || 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
6014 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
6015 data->frame_cols, 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
6016 #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
6017 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
6018 != 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
6019 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
6020 make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6021 #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
6022 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
6023 != 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
6024 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
6025 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
6026 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6027 #endif
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6028
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6029 /* "Swap out" point from the selected window's buffer
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6030 into the window itself. (Normally the pointm of the selected
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6031 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
6032 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
6033 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
6034 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
6035 {
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
6036 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
6037 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
6038 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
6039 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
6040 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
6041 }
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
6042
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6043 windows_or_buffers_changed++;
10666
e1dfb47b664e (Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents: 10461
diff changeset
6044 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
6045
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6046 /* Problem: Freeing all matrices and later allocating them again
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6047 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
6048 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
6049 below. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6050 root_window = XWINDOW (FRAME_ROOT_WINDOW (f));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6051 leaf_windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6052 = (struct window **) alloca (count_windows (root_window)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6053 * sizeof (struct window *));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6054 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
6055
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6056 /* Kludge Alert!
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6057 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
6058 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
6059
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6060 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
6061 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
6062 dead. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6063 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
6064
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6065 for (k = 0; k < saved_windows->size; k++)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6066 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6067 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
6068 w = XWINDOW (p->window);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6069 w->next = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6070
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6071 if (!NILP (p->parent))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6072 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
6073 XFASTINT (p->parent))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6074 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6075 w->parent = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6076
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6077 if (!NILP (p->prev))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6078 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6079 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
6080 XFASTINT (p->prev))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6081 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
6082 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6083 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
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 w->prev = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6086 if (!NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6087 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6088 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
6089 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6090 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
6091 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
6092 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6093 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6094 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6095 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
6096 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
6097 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6098 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6099 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6100
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6101 /* 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
6102 restore it now. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6103 if (BUFFERP (w->total_lines))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6104 w->buffer = w->total_lines;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6105 w->left_col = p->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6106 w->top_line = p->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6107 w->total_cols = p->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6108 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
6109 w->hscroll = p->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6110 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
6111 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
6112 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
6113 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
6114 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
6115 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
6116 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
6117 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
6118 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
6119 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
6120 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
6121 w->dedicated = p->dedicated;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
6122 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
6123 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
6124 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
6125
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6126 /* 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
6127 if (NILP (p->buffer))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6128 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6129 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6130 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6131 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
6132 /* 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
6133 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6134 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6135 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
6136 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
6137 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
6138 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
6139 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
6140
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6141 /* 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
6142 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
6143 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
6144 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
6145 && 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
6146 Fgoto_char (w->pointm);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6147 }
3535
581c09f72dbd (Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents: 3354
diff changeset
6148 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
6149 /* 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
6150 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6151 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
6152 /* 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
6153 range. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6154 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
6155 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
6156 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6157 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6158 else
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6159 /* 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
6160 are real. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6161 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6162 /* 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
6163 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
6164 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
6165 w->buffer);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6166 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
6167 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
6168 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
6169 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
6170 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6171 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6172 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6173 }
1237
3929b2135e58 * window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents: 1123
diff changeset
6174
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6175 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
6176 /* 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
6177 using the buffer that has been restored into it.
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6178 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
6179 selected_window = Qnil;
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6180
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6181 /* Arrange *not* to restore point in the buffer that was
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6182 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
6183 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
6184 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
6185 make_number (old_point),
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6186 XWINDOW (data->current_window)->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6187
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
6188 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
6189 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
6190 = selected_window;
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6191
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6192 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
6193 || (FRAMEP (data->focus_frame)
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6194 && FRAME_LIVE_P (XFRAME (data->focus_frame))))
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6195 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
6196
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6197 #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
6198 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
6199 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
6200 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
36809
126bac1a4495 (Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents: 36635
diff changeset
6201 0, 0);
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6202 #endif
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6203
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6204 /* 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
6205 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
6206 || previous_frame_cols != FRAME_COLS (f))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6207 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
6208 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
6209 #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
6210 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
6211 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
6212 make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6213 #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
6214 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
6215 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
6216 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
6217 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6218 #endif
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6219
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6220 /* 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
6221 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
6222 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6223 if (NILP (leaf_windows[i]->buffer))
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6224 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6225 /* Assert it's not reused as a combination. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6226 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
6227 && NILP (leaf_windows[i]->vchild));
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6228 free_window_matrices (leaf_windows[i]);
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6229 }
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6230 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
6231 ++n;
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6232 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6233
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6234 adjust_glyphs (f);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6235
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6236 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
6237
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6238 /* 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
6239 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
6240 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
6241 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
6242 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
6243 if (FRAME_LIVE_P (XFRAME (data->selected_frame)))
36809
126bac1a4495 (Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents: 36635
diff changeset
6244 do_switch_frame (data->selected_frame, 0, 0);
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6245
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
6246 run_window_configuration_change_hook (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6247 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6248
1325
f03e559aac3e * window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents: 1280
diff changeset
6249 if (!NILP (new_current_buffer))
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6250 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
6251
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6252 Vminibuf_scroll_window = data->minibuf_scroll_window;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
6253 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
6254
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6255 return (FRAME_LIVE_P (f) ? Qt : Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6256 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6257
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6258 /* Mark all windows now on frame as deleted
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6259 by setting their buffers to nil. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6260
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6261 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6262 delete_all_subwindows (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6263 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6264 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6265 if (!NILP (w->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6266 delete_all_subwindows (XWINDOW (w->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6267 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6268 delete_all_subwindows (XWINDOW (w->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6269 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6270 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
6271
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6272 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
6273
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6274 if (!NILP (w->buffer))
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6275 unshow_buffer (w);
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6276
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6277 /* 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
6278 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
6279 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
6280 vchild or hchild set. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6281 w->buffer = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6282 w->vchild = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6283 w->hchild = Qnil;
30045
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6284
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6285 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6286 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6287
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6288 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6289 count_windows (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6290 register struct window *window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6291 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6292 register int count = 1;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6293 if (!NILP (window->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6294 count += count_windows (XWINDOW (window->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6295 if (!NILP (window->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6296 count += count_windows (XWINDOW (window->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6297 if (!NILP (window->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6298 count += count_windows (XWINDOW (window->hchild));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6299 return count;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6300 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6301
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6302
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6303 /* 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
6304 Value is last index + 1. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6305
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6306 static int
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6307 get_leaf_windows (w, flat, i)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6308 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6309 struct window **flat;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6310 int i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6311 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6312 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6313 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6314 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6315 i = get_leaf_windows (XWINDOW (w->hchild), flat, i);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6316 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6317 i = get_leaf_windows (XWINDOW (w->vchild), flat, i);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6318 else
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6319 flat[i++] = w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6320
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6321 w = NILP (w->next) ? 0 : XWINDOW (w->next);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6322 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6323
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6324 return i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6325 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6326
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6327
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6328 /* 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
6329 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
6330 can be returned. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6331
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6332 struct glyph *
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6333 get_phys_cursor_glyph (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6334 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6335 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6336 struct glyph_row *row;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6337 struct glyph *glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6338
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6339 if (w->phys_cursor.vpos >= 0
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6340 && w->phys_cursor.vpos < w->current_matrix->nrows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6341 && (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
6342 row->enabled_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6343 && row->used[TEXT_AREA] > w->phys_cursor.hpos)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6344 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6345 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6346 glyph = NULL;
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 return glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6349 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6350
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6351
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6352 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6353 save_window_save (window, vector, i)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6354 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6355 struct Lisp_Vector *vector;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6356 int i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6357 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6358 register struct saved_window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6359 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6360 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6361
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6362 for (;!NILP (window); window = w->next)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6363 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6364 p = SAVED_WINDOW_N (vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6365 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6366
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
6367 XSETFASTINT (w->temslot, i); i++;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6368 p->window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6369 p->buffer = w->buffer;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6370 p->left_col = w->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6371 p->top_line = w->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6372 p->total_cols = w->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6373 p->total_lines = w->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6374 p->hscroll = w->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6375 p->min_hscroll = w->min_hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6376 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
6377 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
6378 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
6379 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
6380 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
6381 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
6382 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
6383 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
6384 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
6385 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
6386 p->dedicated = w->dedicated;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
6387 p->resize_proportionally = w->resize_proportionally;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6388 if (!NILP (w->buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6389 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6390 /* Save w's value of point in the window configuration.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6391 If w is the selected window, then get the value of point
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6392 from the buffer; pointm is garbage in the selected window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6393 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6394 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6395 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
6396 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
6397 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
6398 BUF_PT_BYTE (XBUFFER (w->buffer)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6399 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6400 else
12981
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6401 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
6402
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6403 p->start = Fcopy_marker (w->start, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6404 p->start_at_line_beg = w->start_at_line_beg;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6405
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6406 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
6407 p->mark = Fcopy_marker (tem, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6408 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6409 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6410 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6411 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6412 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6413 p->mark = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6414 p->start_at_line_beg = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6415 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6416
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6417 if (NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6418 p->parent = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6419 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6420 p->parent = XWINDOW (w->parent)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6421
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6422 if (NILP (w->prev))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6423 p->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6424 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6425 p->prev = XWINDOW (w->prev)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6426
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6427 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6428 i = save_window_save (w->vchild, vector, i);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6429 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6430 i = save_window_save (w->hchild, vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6431 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6432
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6433 return i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6434 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6435
16485
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16392
diff changeset
6436 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
6437 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
6438 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
6439 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
6440 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
6441 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
6442 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
6443 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
6444 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
6445 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
6446 (frame)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6447 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6448 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6449 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6450 register int n_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6451 register struct save_window_data *data;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6452 register int i;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6453 FRAME_PTR f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6454
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6455 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6456 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6457 CHECK_LIVE_FRAME (frame);
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6458 f = XFRAME (frame);
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6459
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6460 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
6461 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
6462 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
6463
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
6464 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
6465 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
6466 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
6467 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
6468 data->selected_frame = selected_frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6469 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
6470 XSETBUFFER (data->current_buffer, current_buffer);
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6471 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
6472 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6473 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
6474 data->focus_frame = FRAME_FOCUS_FRAME (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6475 tem = Fmake_vector (make_number (n_windows), Qnil);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6476 data->saved_windows = tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6477 for (i = 0; i < n_windows; i++)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6478 XVECTOR (tem)->contents[i]
65004
bc5cf5fc0f9e (SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
6479 = 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
6480 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
6481 XSETWINDOW_CONFIGURATION (tem, data);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6482 return (tem);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6483 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6484
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6485 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
6486 0, UNEVALLED, 0,
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
6487 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
6488 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
6489 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
6490 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
6491 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
6492 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
6493 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
6494 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
6495 (args)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6496 Lisp_Object args;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6497 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6498 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
6499 register int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6500
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6501 record_unwind_protect (Fset_window_configuration,
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6502 Fcurrent_window_configuration (Qnil));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6503 val = Fprogn (args);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6504 return unbind_to (count, val);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6505 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6506
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6507
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6508
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6509 /***********************************************************************
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6510 Window Split Tree
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6511 ***********************************************************************/
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6512
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6513 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
6514 window_tree (w)
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6515 struct window *w;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6516 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6517 Lisp_Object tail = Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6518 Lisp_Object result = Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6519
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6520 while (w)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6521 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6522 Lisp_Object wn;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6523
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6524 XSETWINDOW (wn, w);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6525 if (!NILP (w->hchild))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6526 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
6527 window_tree (XWINDOW (w->hchild))));
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6528 else if (!NILP (w->vchild))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6529 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
6530 window_tree (XWINDOW (w->vchild))));
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6531
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6532 if (NILP (result))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6533 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6534 result = tail = Fcons (wn, Qnil);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6535 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6536 else
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6537 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6538 XSETCDR (tail, Fcons (wn, Qnil));
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6539 tail = XCDR (tail);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6540 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6541
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6542 w = NILP (w->next) ? 0 : XWINDOW (w->next);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6543 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6544
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6545 return result;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6546 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6547
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6548
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6549
65908
454a4a463081 (window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents: 65826
diff changeset
6550 DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6551 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
6552 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
6553
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6554 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
6555 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
6556 is the frame's minibuffer window.
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6557
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6558 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
6559 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
6560 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
6561 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
6562 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
6563 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
6564 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
6565
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6566 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
6567 selected frame. */)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6568 (frame)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6569 Lisp_Object frame;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6570 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6571 FRAME_PTR f;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6572
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6573 if (NILP (frame))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6574 frame = selected_frame;
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 CHECK_FRAME (frame);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6577 f = XFRAME (frame);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6578
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6579 if (!FRAME_LIVE_P (f))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6580 return Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6581
65908
454a4a463081 (window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents: 65826
diff changeset
6582 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
6583 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6584
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6585
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6586 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6587 Marginal Areas
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6588 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6589
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6590 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
6591 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
6592 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
6593 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
6594 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
6595 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
6596 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
6597 means no margin. */)
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6598 (window, left_width, right_width)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6599 Lisp_Object window, left_width, right_width;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6600 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6601 struct window *w = decode_window (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6602
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6603 /* Translate negative or zero widths to nil.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6604 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
6605
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6606 if (!NILP (left_width))
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6607 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6608 CHECK_NUMBER (left_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6609 if (XINT (left_width) <= 0)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6610 left_width = Qnil;
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6611 }
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6612
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6613 if (!NILP (right_width))
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6614 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6615 CHECK_NUMBER (right_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6616 if (XINT (right_width) <= 0)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6617 right_width = Qnil;
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6618 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6619
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6620 if (!EQ (w->left_margin_cols, left_width)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6621 || !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
6622 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6623 w->left_margin_cols = left_width;
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6624 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
6625
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6626 adjust_window_margins (w);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6627
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6628 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6629 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6630 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6631
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6632 return Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6633 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6634
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6635
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6636 DEFUN ("window-margins", Fwindow_margins, Swindow_margins,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6637 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
6638 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
6639 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
6640 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
6641 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
6642 as nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
6643 (window)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6644 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6645 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6646 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
6647 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
6648 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6649
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6650
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6651
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6652 /***********************************************************************
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6653 Fringes
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6654 ***********************************************************************/
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6655
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6656 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
6657 2, 4, 0,
52853
91a9da753e30 (Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents: 52852
diff changeset
6658 doc: /* Set the fringe widths of window WINDOW.
91a9da753e30 (Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents: 52852
diff changeset
6659 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
6660 window.
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
6661 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
6662 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
6663 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
6664 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
6665 the command `set-fringe-style'.
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
6666 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
6667 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
6668 display marginal areas and the text area. */)
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6669 (window, left_width, right_width, outside_margins)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6670 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
6671 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6672 struct window *w = decode_window (window);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6673
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6674 if (!NILP (left_width))
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6675 CHECK_NATNUM (left_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6676 if (!NILP (right_width))
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6677 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
6678
72438
d08eb7bd3ca2 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 72437
diff changeset
6679 /* 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
6680 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
6681 && (!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
6682 || !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
6683 || !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
6684 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6685 w->left_fringe_width = left_width;
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6686 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
6687 w->fringes_outside_margins = outside_margins;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6688
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6689 adjust_window_margins (w);
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 clear_glyph_matrix (w->current_matrix);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6692 w->window_end_valid = Qnil;
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 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6695 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
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 return Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6699 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6700
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6701
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6702 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
6703 0, 1, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6704 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
6705 If WINDOW is omitted or nil, use the currently selected window.
53927
d7b95d7f2179 (Fwindow_fringes): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 53703
diff changeset
6706 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
6707 (window)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6708 Lisp_Object window;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6709 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6710 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
6711
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6712 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
6713 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
6714 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
6715 ? Qt : Qnil), Qnil)));
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6716 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6717
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6718
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6719
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6720 /***********************************************************************
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6721 Scroll bars
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6722 ***********************************************************************/
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6723
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6724 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
6725 2, 4, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6726 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
6727 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
6728 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
6729 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
6730 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
6731 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
6732 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
6733 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
6734 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
6735 (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
6736 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
6737 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6738 struct window *w = decode_window (window);
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 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
6741 {
f3a76c43ac80 (Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58441
diff changeset
6742 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
6743
f3a76c43ac80 (Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58441
diff changeset
6744 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
6745 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
6746 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6747
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
6748 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
6749 || 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
6750 || EQ (vertical_type, Qright)
26d1a4665f6c (Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents: 52560
diff changeset
6751 || EQ (vertical_type, Qt)))
26d1a4665f6c (Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents: 52560
diff changeset
6752 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
6753
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6754 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
6755 || !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
6756 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6757 w->scroll_bar_width = width;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6758 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
6759
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6760 adjust_window_margins (w);
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 clear_glyph_matrix (w->current_matrix);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6763 w->window_end_valid = Qnil;
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 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6766 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6767 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6768
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6769 return Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6770 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6771
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6772
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6773 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
6774 0, 1, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6775 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
6776 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
6777 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
6778 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
6779 value. */)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6780 (window)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6781 Lisp_Object window;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6782 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6783 struct window *w = decode_window (window);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6784 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
6785 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6786 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))),
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6787 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
6788 Fcons (w->vertical_scroll_bar_type,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6789 Fcons (Qnil, Qnil))));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6790 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6791
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6792
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6793
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6794 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6795 Smooth scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6796 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6797
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6798 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
6799 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
6800 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
6801 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
6802 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
6803 (window, pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6804 Lisp_Object window, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6805 {
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6806 Lisp_Object result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6807 struct frame *f;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6808 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6809
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6810 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6811 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6812 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6813 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6814 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6815 f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6816
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6817 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
6818 result = (NILP (pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6819 ? 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
6820 : make_number (-w->vscroll));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6821 else
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6822 result = make_number (0);
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6823 return result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6824 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6825
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6826
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6827 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
6828 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
6829 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
6830 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
6831 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
6832 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
6833 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
6834 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
6835 result of this rounding.
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
6836 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
6837 (window, vscroll, pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6838 Lisp_Object window, vscroll, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6839 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6840 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6841 struct frame *f;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6842
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6843 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6844 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6845 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6846 CHECK_WINDOW (window);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6847 CHECK_NUMBER_OR_FLOAT (vscroll);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6848
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6849 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6850 f = XFRAME (w->frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6851
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6852 if (FRAME_WINDOW_P (f))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6853 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6854 int old_dy = w->vscroll;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6855
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6856 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
6857 ? 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
6858 : XFLOATINT (vscroll));
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6859 w->vscroll = min (w->vscroll, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6860
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6861 if (w->vscroll != old_dy)
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6862 {
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6863 /* 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
6864 area becomes larger than before. */
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6865 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
6866 adjust_glyphs (f);
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6867
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6868 /* Prevent redisplay shortcuts. */
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6869 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
6870 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6871 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6872
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6873 return Fwindow_vscroll (window, pixels_p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6874 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6875
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6876
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6877 /* 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
6878 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
6879 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
6880
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6881 void
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6882 foreach_window (f, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6883 struct frame *f;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6884 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6885 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6886 {
70736
6e5b403b5586 (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 70155
diff changeset
6887 /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */
6e5b403b5586 (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 70155
diff changeset
6888 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
6889 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
6890 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6891
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6892
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6893 /* 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
6894 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
6895 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
6896 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
6897
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6898 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6899 foreach_window_1 (w, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6900 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6901 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6902 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6903 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6904 int cont;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6905
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6906 for (cont = 1; w && cont;)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6907 {
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6908 if (!NILP (w->hchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6909 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
6910 else if (!NILP (w->vchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6911 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6912 else
30366
8dd313fc287d (foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents: 30362
diff changeset
6913 cont = fn (w, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6914
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6915 w = NILP (w->next) ? 0 : XWINDOW (w->next);
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6916 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6917
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6918 return cont;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6919 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6920
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6921
39952
17e0900cd156 Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39748
diff changeset
6922 /* 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
6923 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
6924 the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6925
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6926 static int
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6927 freeze_window_start (w, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6928 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6929 void *freeze_p;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6930 {
84376
584ae8393da8 (freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84357
diff changeset
6931 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
6932 || (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
6933 && (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
6934 || (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
6935 && ! 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
6936 && w == XWINDOW (Vminibuf_scroll_window)))))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6937 freeze_p = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6938
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6939 w->frozen_window_start_p = freeze_p != NULL;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6940 return 1;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6941 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6942
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6943
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6944 /* 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
6945 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
6946 means freeze the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6947
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6948 void
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6949 freeze_window_starts (f, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6950 struct frame *f;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6951 int freeze_p;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6952 {
31903
3e0a1f91c149 (freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents: 31829
diff changeset
6953 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
6954 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6955
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6956
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6957 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6958 Initialization
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6959 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6960
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6961 /* Return 1 if window configurations C1 and C2
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
6962 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
6963
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6964 int
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6965 compare_window_configurations (c1, c2, ignore_positions)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6966 Lisp_Object c1, c2;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6967 int ignore_positions;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6968 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6969 register struct save_window_data *d1, *d2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6970 struct Lisp_Vector *sw1, *sw2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6971 int i;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6972
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
6973 CHECK_WINDOW_CONFIGURATION (c1);
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
6974 CHECK_WINDOW_CONFIGURATION (c2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6975
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6976 d1 = (struct save_window_data *) XVECTOR (c1);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6977 d2 = (struct save_window_data *) XVECTOR (c2);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6978 sw1 = XVECTOR (d1->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6979 sw2 = XVECTOR (d2->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6980
86162
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
6981 if (d1->frame_cols != d2->frame_cols)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6982 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
6983 if (d1->frame_lines != d2->frame_lines)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6984 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
6985 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
6986 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6987 if (! EQ (d1->selected_frame, d2->selected_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6988 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6989 /* Don't compare the current_window field directly.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6990 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
6991 if (! EQ (d1->current_buffer, d2->current_buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6992 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6993 if (! ignore_positions)
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6994 {
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6995 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
6996 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6997 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
6998 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6999 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7000 /* Don't compare the root_window field.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7001 We don't require the two configurations
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7002 to use the same window object,
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7003 and the two root windows must be equivalent
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7004 if everything else compares equal. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7005 if (! EQ (d1->focus_frame, d2->focus_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7006 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7007
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7008 /* 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
7009 if (sw1->size != sw2->size)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7010 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7011
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7012 for (i = 0; i < sw1->size; i++)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7013 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7014 struct saved_window *p1, *p2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7015 int w1_is_current, w2_is_current;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7016
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7017 p1 = SAVED_WINDOW_N (sw1, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7018 p2 = SAVED_WINDOW_N (sw2, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7019
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7020 /* Verify that the current windows in the two
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7021 configurations correspond to each other. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7022 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
7023 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
7024
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7025 if (w1_is_current != w2_is_current)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7026 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7027
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7028 /* Verify that the corresponding windows do match. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7029 if (! EQ (p1->buffer, p2->buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7030 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7031 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
7032 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7033 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
7034 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7035 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
7036 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7037 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
7038 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7039 if (! EQ (p1->display_table, p2->display_table))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7040 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7041 if (! EQ (p1->parent, p2->parent))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7042 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7043 if (! EQ (p1->prev, p2->prev))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7044 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7045 if (! ignore_positions)
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7046 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7047 if (! EQ (p1->hscroll, p2->hscroll))
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7048 return 0;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
7049 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
7050 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7051 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
7052 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7053 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
7054 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7055 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
7056 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7057 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
7058 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7059 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7060 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
7061 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7062 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
7063 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7064 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
7065 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7066 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
7067 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7068 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
7069 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7070 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
7071 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7072 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
7073 return 0;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7074 }
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7075
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7076 return 1;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7077 }
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7078
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7079 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
7080 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
7081 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
7082 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
7083 and scrolling positions. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7084 (x, y)
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7085 Lisp_Object x, y;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7086 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7087 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
7088 return Qt;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7089 return Qnil;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7090 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7091
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7092 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7093 init_window_once ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7094 {
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83005
diff changeset
7095 struct frame *f = make_initial_frame ();
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7096 XSETFRAME (selected_frame, f);
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7097 Vterminal_frame = selected_frame;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7098 minibuf_window = f->minibuffer_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7099 selected_window = f->selected_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7100 last_nonminibuf_frame = f;
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
7101
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
7102 window_initialized = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7103 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7104
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7105 void
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7106 init_window ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7107 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7108 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7109 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7110
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7111 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7112 syms_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7113 {
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7114 Qscroll_up = intern ("scroll-up");
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7115 staticpro (&Qscroll_up);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7116
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7117 Qscroll_down = intern ("scroll-down");
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7118 staticpro (&Qscroll_down);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7119
25540
2b4bdd114899 (Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents: 25517
diff changeset
7120 Qwindow_size_fixed = intern ("window-size-fixed");
2b4bdd114899 (Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents: 25517
diff changeset
7121 staticpro (&Qwindow_size_fixed);
61755
71259596d397 (window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 61635
diff changeset
7122 Fset (Qwindow_size_fixed, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
7123
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7124 staticpro (&Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7125 Qwindow_configuration_change_hook
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7126 = intern ("window-configuration-change-hook");
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7127
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7128 Qwindowp = intern ("windowp");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7129 staticpro (&Qwindowp);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7130
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7131 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
7132 staticpro (&Qwindow_configuration_p);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7133
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
7134 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
7135 staticpro (&Qwindow_live_p);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
7136
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
7137 Qdisplay_buffer = intern ("display-buffer");
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
7138 staticpro (&Qdisplay_buffer);
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
7139
11405
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
7140 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
7141 staticpro (&Qtemp_buffer_show_hook);
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
7142
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7143 staticpro (&Vwindow_list);
43597
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
7144
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
7145 minibuf_selected_window = Qnil;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
7146 staticpro (&minibuf_selected_window);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7147
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7148 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
7149 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
7150 window_scroll_preserve_hpos = -1;
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7151 window_scroll_preserve_vpos = -1;
69342
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
7152
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7153 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
7154 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
7155 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
7156 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
7157 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
7158 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7159 Vtemp_buffer_show_function = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7160
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7161 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
7162 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7163 Vminibuf_scroll_window = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7164
43281
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
7165 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
7166 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
7167 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
7168 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
7169 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
7170
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7171 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
7172 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7173 Vother_window_scroll_buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7174
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
7175 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
7176 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
7177 auto_window_vscroll_p = 1;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
7178
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7179 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
7180 doc: /* *Number of lines of continuity when scrolling by screenfuls. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7181 next_screen_context_lines = 2;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7182
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7183 DEFVAR_INT ("window-min-height", &window_min_height,
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7184 doc: /* Allow deleting windows less than this tall.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7185 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
7186 is counted as one line.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7187
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7188 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
7189 windows vertically. A value less than 1 is invalid. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7190 window_min_height = 4;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7191
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7192 DEFVAR_INT ("window-min-width", &window_min_width,
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7193 doc: /* Allow deleting windows less than this wide.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7194 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
7195 the scrollbar.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7196
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7197 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
7198 windows horizontally. A value less than 2 is invalid. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7199 window_min_width = 10;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7200
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7201 DEFVAR_LISP ("scroll-preserve-screen-position",
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7202 &Vscroll_preserve_screen_position,
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7203 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
7204 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
7205 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
7206 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
7207 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
7208 by full screens.
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
7209 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
7210 Vscroll_preserve_screen_position = Qnil;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
7211
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
7212 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
7213 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
7214 Vwindow_point_insertion_type = Qnil;
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
7215
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7216 DEFVAR_LISP ("window-configuration-change-hook",
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7217 &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
7218 doc: /* Functions to call when window configuration changes.
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
7219 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
7220 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
7221 with the relevant frame selected. */);
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7222 Vwindow_configuration_change_hook = Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7223
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7224 defsubr (&Sselected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7225 defsubr (&Sminibuffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7226 defsubr (&Swindow_minibuffer_p);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7227 defsubr (&Swindowp);
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
7228 defsubr (&Swindow_live_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7229 defsubr (&Spos_visible_in_window_p);
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
7230 defsubr (&Swindow_line_height);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7231 defsubr (&Swindow_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7232 defsubr (&Swindow_height);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7233 defsubr (&Swindow_width);
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
7234 defsubr (&Swindow_full_width_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7235 defsubr (&Swindow_hscroll);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7236 defsubr (&Sset_window_hscroll);
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7237 defsubr (&Swindow_redisplay_end_trigger);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7238 defsubr (&Sset_window_redisplay_end_trigger);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7239 defsubr (&Swindow_edges);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7240 defsubr (&Swindow_pixel_edges);
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7241 defsubr (&Swindow_inside_edges);
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7242 defsubr (&Swindow_inside_pixel_edges);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7243 defsubr (&Scoordinates_in_window_p);
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7244 defsubr (&Swindow_at);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7245 defsubr (&Swindow_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7246 defsubr (&Swindow_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7247 defsubr (&Swindow_end);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7248 defsubr (&Sset_window_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7249 defsubr (&Sset_window_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7250 defsubr (&Swindow_dedicated_p);
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
7251 defsubr (&Sset_window_dedicated_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7252 defsubr (&Swindow_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7253 defsubr (&Sset_window_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7254 defsubr (&Snext_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7255 defsubr (&Sprevious_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7256 defsubr (&Sother_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7257 defsubr (&Sget_lru_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7258 defsubr (&Sget_largest_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7259 defsubr (&Sget_buffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7260 defsubr (&Sdelete_other_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7261 defsubr (&Sdelete_windows_on);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7262 defsubr (&Sreplace_buffer_in_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7263 defsubr (&Sdelete_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7264 defsubr (&Sset_window_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7265 defsubr (&Sselect_window);
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
7266 defsubr (&Sforce_window_update);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7267 defsubr (&Ssplit_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7268 defsubr (&Senlarge_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7269 defsubr (&Sshrink_window);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
7270 defsubr (&Sadjust_window_trailing_edge);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7271 defsubr (&Sscroll_up);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7272 defsubr (&Sscroll_down);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7273 defsubr (&Sscroll_left);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7274 defsubr (&Sscroll_right);
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
7275 defsubr (&Sother_window_for_scrolling);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7276 defsubr (&Sscroll_other_window);
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
7277 defsubr (&Sminibuffer_selected_window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7278 defsubr (&Srecenter);
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
7279 defsubr (&Swindow_text_height);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7280 defsubr (&Smove_to_window_line);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7281 defsubr (&Swindow_configuration_p);
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7282 defsubr (&Swindow_configuration_frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7283 defsubr (&Sset_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7284 defsubr (&Scurrent_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7285 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
7286 defsubr (&Swindow_tree);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7287 defsubr (&Sset_window_margins);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7288 defsubr (&Swindow_margins);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7289 defsubr (&Sset_window_fringes);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7290 defsubr (&Swindow_fringes);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7291 defsubr (&Sset_window_scroll_bars);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7292 defsubr (&Swindow_scroll_bars);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7293 defsubr (&Swindow_vscroll);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7294 defsubr (&Sset_window_vscroll);
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7295 defsubr (&Scompare_window_configurations);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7296 defsubr (&Swindow_list);
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7297 defsubr (&Swindow_parameters);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7298 defsubr (&Swindow_parameter);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7299 defsubr (&Sset_window_parameter);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7300
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7301 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7302
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7303 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7304 keys_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7305 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7306 initial_define_key (control_x_map, '1', "delete-other-windows");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7307 initial_define_key (control_x_map, '2', "split-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7308 initial_define_key (control_x_map, '0', "delete-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7309 initial_define_key (control_x_map, 'o', "other-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7310 initial_define_key (control_x_map, '^', "enlarge-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7311 initial_define_key (control_x_map, '<', "scroll-left");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7312 initial_define_key (control_x_map, '>', "scroll-right");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7313
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7314 initial_define_key (global_map, Ctl ('V'), "scroll-up");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7315 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7316 initial_define_key (meta_map, 'v', "scroll-down");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7317
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7318 initial_define_key (global_map, Ctl('L'), "recenter");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7319 initial_define_key (meta_map, 'r', "move-to-window-line");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7320 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7321
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7322 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7323 (do not change this comment) */