annotate src/window.c @ 108746:24d486687f54

Rename image-refresh to image-flush. * image.c (Fimage_flush): Rename from image-refresh. * image.el (image-refresh): Define as an alias for image-flush. * image-mode.el (image-toggle-display-image): Caller changed. * display.texi (Image Cache): Update documentation about image caching.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 22 May 2010 12:48:01 -0400
parents d7b161b7a686
children 4a42850741ad
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,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105877
diff changeset
4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
79759
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>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105404
diff changeset
24 #include <setjmp.h>
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
25
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "lisp.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "buffer.h"
31117
f390b90e3495 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30777
diff changeset
28 #include "keyboard.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39682
diff changeset
29 #include "keymap.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
30 #include "frame.h"
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "window.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "commands.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "indent.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #include "termchar.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #include "disptab.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
36 #include "dispextern.h"
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
37 #include "blockinput.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
38 #include "intervals.h"
85010
a3defcbdb064 (candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84758
diff changeset
39 #include "termhooks.h" /* For FRAME_TERMINAL. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
40
21825
697991d2a2c4 Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents: 21533
diff changeset
41 #ifdef HAVE_X_WINDOWS
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
42 #include "xterm.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
43 #endif /* HAVE_X_WINDOWS */
27633
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
44 #ifdef WINDOWSNT
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
45 #include "w32term.h"
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
46 #endif
27956
8d38dbe58989 [MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents: 27869
diff changeset
47 #ifdef MSDOS
8d38dbe58989 [MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents: 27869
diff changeset
48 #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
49 #endif
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96361
diff changeset
50 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96361
diff changeset
51 #include "nsterm.h"
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96361
diff changeset
52 #endif
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
53
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
54
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
55 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
56 Lisp_Object Qdisplay_buffer;
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
57 Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
41736
d583dac59ea4 (Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
Jason Rumney <jasonr@gnu.org>
parents: 41719
diff changeset
58 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
59
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
60 extern Lisp_Object Qleft_margin, Qright_margin;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
61
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
62 static int displayed_window_lines P_ ((struct window *));
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
63 static struct window *decode_window P_ ((Lisp_Object));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
64 static int count_windows P_ ((struct window *));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
65 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
66 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
67 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
68 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
69 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
70 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
71 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
72 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
73 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
74 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
75 static void enlarge_window P_ ((Lisp_Object, int, int));
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
76 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
77 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
78 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
79 Lisp_Object));
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
80 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object,
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
81 Lisp_Object, int));
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
82 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
83 Lisp_Object *));
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
84 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
85 int (* fn) (struct window *, void *),
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
86 void *));
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
87 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
88
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 /* This is the window in which the terminal's cursor should
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 be left when nothing is being done with it. This must
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 always be a leaf window, and its buffer is selected by
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 the top level editing loop at the end of each command.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 This value is always the same as
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
95 FRAME_SELECTED_WINDOW (selected_frame). */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 Lisp_Object selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
99 /* 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
100 Functions creating or deleting windows should invalidate this cache
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
101 by setting it to nil. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
102
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
103 Lisp_Object Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
104
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
105 /* The mini-buffer window of the selected frame.
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
106 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
107 by comparing against this; but you can test for mini-bufferness of
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 the selected window. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
109
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 Lisp_Object minibuf_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
112 /* 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
113 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
114
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
115 Lisp_Object minibuf_selected_window;
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
116
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 /* 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
118 when the mini-buffer is selected. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
119
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120 Lisp_Object Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 /* 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
123
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 Lisp_Object Vother_window_scroll_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 /* 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
127
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 Lisp_Object Vtemp_buffer_show_function;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
130 /* 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
131 does partial scrolling by modifying window-vscroll. */
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
132
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
133 int auto_window_vscroll_p;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
134
43281
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
135 /* 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
136 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
137 minibuffer is active. */
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
138 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
139
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 /* 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
141
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
142 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
143 EMACS_INT window_min_width;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
145 /* 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
146
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
147 Lisp_Object Qtemp_buffer_show_hook;
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
148
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 /* 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
150
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
151 EMACS_INT next_screen_context_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 /* Incremented for each window created. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
154
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 static int sequence_number;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
157 /* Nonzero after init_window_once has finished. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
158
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
159 static int window_initialized;
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
160
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
161 /* Hook to run when window config changes. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
162
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
163 static Lisp_Object Qwindow_configuration_change_hook;
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
164 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
165
58083
49b5dabf0ccc Fix commentary.
Kim F. Storm <storm@cua.dk>
parents: 57898
diff changeset
166 /* 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
167 at the same screen height as previously. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
168
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
169 Lisp_Object Vscroll_preserve_screen_position;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
170
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
171 /* 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
172
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
173 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
174
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
175 /* 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
176
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
177 int window_deletion_count;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
178
69342
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
179 /* 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
180
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
181 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
182 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
183
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
184 /* 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
185
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_hpos;
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
187 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
188
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
189 #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
190 /* 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
191 static int inhibit_frame_unsplittable;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
192 #endif /* 0 */
17540
eb82c4de9dea (frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17365
diff changeset
193
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
194 extern EMACS_INT scroll_margin;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
195
14149
0d67df27dc2a (Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents: 14089
diff changeset
196 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
103557
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
197
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
198 /* If non-nil, then the `recenter' command with a nil argument
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
199 the entire frame to be redrawn; the special value `tty' causes the
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
200 frame to be redrawn only if it is a tty frame. */
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
201
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
202 static Lisp_Object Vrecenter_redisplay;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
203 extern Lisp_Object Qtty;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
204
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 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
207 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
208 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
209 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
211 return WINDOWP (object) ? Qt : Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
214 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
215 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
216 (object)
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
217 Lisp_Object object;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
218 {
35398
ef34ddc12a7d * window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 35396
diff changeset
219 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
220 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
221
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 Lisp_Object
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 make_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
225 Lisp_Object val;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 register struct window *p;
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
227
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
228 p = allocate_window ();
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
229 ++sequence_number;
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
230 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
231 XSETFASTINT (p->left_col, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
232 XSETFASTINT (p->top_line, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
233 XSETFASTINT (p->total_lines, 0);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
234 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
235 XSETFASTINT (p->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
236 XSETFASTINT (p->min_hscroll, 0);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
237 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 p->start = Fmake_marker ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 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
240 XSETFASTINT (p->use_time, 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
241 p->frame = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 p->display_table = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 p->dedicated = Qnil;
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
244 p->window_parameters = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
245 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
246 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
247 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
248 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
249 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
250 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
251 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
252 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
253 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
254 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
255 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
256 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
257 p->vscroll = 0;
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
258 XSETWINDOW (val, p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
259 XSETFASTINT (p->last_point, 0);
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
260 p->frozen_window_start_p = 0;
44744
8c52c2bf3b3f (make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents: 44649
diff changeset
261 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
262 p->left_margin_cols = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
263 p->right_margin_cols = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
264 p->left_fringe_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
265 p->right_fringe_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
266 p->fringes_outside_margins = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
267 p->scroll_bar_width = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
268 p->vertical_scroll_bar_type = Qt;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
269 p->resize_proportionally = Qnil;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
270
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
271 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 return val;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275 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
276 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
277 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 return selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
282 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
283 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
284 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
285 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
286 (frame)
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
287 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 {
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
289 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
290 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
291 CHECK_LIVE_FRAME (frame);
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
292 return FRAME_MINIBUF_WINDOW (XFRAME (frame));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
295 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
296 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
297 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
298 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 struct window *w = decode_window (window);
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
302 return MINI_WINDOW_P (w) ? Qt : Qnil;
32710
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
303 }
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
304
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
305
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 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
307 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
308 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
309 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
310 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
311 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
312 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
313 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
314 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
315
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
316 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
317 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
318 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
319 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
320 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
321 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
322 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
323 (pos, window, partially)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
324 Lisp_Object pos, window, partially;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 register int posint;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328 register struct buffer *buf;
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
329 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
330 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
331 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
332 int x, y;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
334 w = decode_window (window);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
335 buf = XBUFFER (w->buffer);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
336 SET_TEXT_POS_FROM_MARKER (top, w->start);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
337
73013
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
338 if (EQ (pos, Qt))
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
339 posint = -1;
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
340 else if (!NILP (pos))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
342 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343 posint = XINT (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344 }
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
345 else if (w == XWINDOW (selected_window))
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
346 posint = PT;
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
347 else
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
348 posint = XMARKER (w->pointm)->charpos;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
349
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
350 /* 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
351 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
352 if ((EQ (pos, Qt)
6ebbc42247b3 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72998
diff changeset
353 || (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
354 && 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
355 && 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
356 && 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
357 && (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
358 in_window = Qt;
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
359
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
360 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
361 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
362 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
363 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
364 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
365 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
366 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
367 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
368 }
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
369
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
370 return in_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 }
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
372
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
373 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
374 Swindow_line_height, 0, 2, 0,
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
375 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
376 If WINDOW is nil or omitted, use selected window.
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
377
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
378 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
379 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
380 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
381 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
382
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
383 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
384 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
385 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
386 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
387 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
388 of the (first) text line, YPOS is negative.
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
389
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
390 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
391 `pos-visible-in-window-p' to obtain the information. */)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
392 (line, window)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
393 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
394 {
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
395 register struct window *w;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
396 register struct buffer *b;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
397 struct glyph_row *row, *end_row;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
398 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
399
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
400 w = decode_window (window);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
401
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
402 if (noninteractive
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
403 || w->pseudo_window_p)
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
404 return Qnil;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
405
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
406 CHECK_BUFFER (w->buffer);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
407 b = XBUFFER (w->buffer);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
408
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
409 /* 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
410 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
411 || current_buffer->clip_changed
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
412 || 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
413 || 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
414 || 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
415 return Qnil;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
416
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
417 if (NILP (line))
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
418 {
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
419 i = w->cursor.vpos;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
420 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
421 || (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
422 return Qnil;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
423 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
424 goto found_row;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
425 }
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
426
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
427 if (EQ (line, Qheader_line))
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 if (!WINDOW_WANTS_HEADER_LINE_P (w))
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
430 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
431 row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
432 if (!row->enabled_p)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
433 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
434 return list4 (make_number (row->height),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
435 make_number (0), make_number (0),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
436 make_number (0));
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
437 }
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
438
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
439 if (EQ (line, Qmode_line))
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 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
442 if (!row->enabled_p)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
443 return Qnil;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
444 return list4 (make_number (row->height),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
445 make_number (0), /* not accurate */
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
446 make_number (WINDOW_HEADER_LINE_HEIGHT (w)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
447 + window_text_bottom_y (w)),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
448 make_number (0));
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
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
451 CHECK_NUMBER (line);
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
452 n = XINT (line);
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
453
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
454 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
455 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
456 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
457 i = 0;
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
458
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
459 while ((n < 0 || i < n)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
460 && row <= end_row && row->enabled_p
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
461 && row->y + row->height < max_y)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
462 row++, i++;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
463
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
464 if (row > end_row || !row->enabled_p)
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
465 return Qnil;
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
466
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
467 if (++n < 0)
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
468 {
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
469 if (-n > i)
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
470 return Qnil;
72990
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
471 row += n;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
472 i += n;
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
473 }
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
474
2d3156eeb678 (Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents: 72955
diff changeset
475 found_row:
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
476 crop = max (0, (row->y + row->height) - max_y);
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
477 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
478 make_number (i),
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
479 make_number (row->y),
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
480 make_number (crop));
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
481 }
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
482
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
483
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 static struct window *
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 decode_window (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
489 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 return XWINDOW (selected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
492 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 return XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
496 static struct window *
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
497 decode_any_window (window)
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
498 register Lisp_Object window;
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
499 {
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
500 if (NILP (window))
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
501 return XWINDOW (selected_window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
502
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
503 CHECK_WINDOW (window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
504 return XWINDOW (window);
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
505 }
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
506
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 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
508 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
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 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
513 return decode_window (window)->buffer;
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-height", Fwindow_height, Swindow_height, 0, 1, 0,
99210
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
517 doc: /* Return the number of lines in WINDOW.
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
518 WINDOW defaults to the selected window.
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
519
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
520 The return value includes WINDOW's mode line and header line, if any. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
521 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
524 return decode_any_window (window)->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 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
528 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
529 WINDOW defaults to the selected window.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
530
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
531 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
532 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
533 (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
534 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
535 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
536 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
537 return make_number (window_box_text_cols (decode_any_window (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
540 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
541 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
542 WINDOW defaults to the selected window. */)
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
543 (window)
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
544 Lisp_Object window;
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
545 {
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
546 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
547 }
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
548
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549 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
550 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
551 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
552 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 return decode_window (window)->hscroll;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 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
559 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
560 Return NCOL. NCOL should be zero or positive.
45645
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
561
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
562 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
563 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
564 (window, ncol)
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
565 Lisp_Object window, ncol;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566 {
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
567 struct window *w = decode_window (window);
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
568 int hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
570 CHECK_NUMBER (ncol);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
571 hscroll = max (0, XINT (ncol));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
572
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
573 /* Prevent redisplay shortcuts when changing the hscroll. */
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
574 if (XINT (w->hscroll) != hscroll)
25375
919b568e4108 (Fset_window_hscroll): Set
Gerd Moellmann <gerd@gnu.org>
parents: 25356
diff changeset
575 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
576
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
577 w->hscroll = make_number (hscroll);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
578 return ncol;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
581 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
582 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
583 doc: /* Return WINDOW's redisplay end trigger value.
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
584 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
585 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
586 (window)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
587 Lisp_Object window;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
588 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
589 return decode_window (window)->redisplay_end_trigger;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
590 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
591
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
592 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
593 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
594 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
595 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
596 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
597 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
598 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
599 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
600 (window, value)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
601 register Lisp_Object window, value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
602 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
603 register struct window *w;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
604
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
605 w = decode_window (window);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
606 w->redisplay_end_trigger = value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
607 return value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
608 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
609
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
610 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
611 doc: /* Return a list of the edge coordinates of WINDOW.
105728
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
612 The list has the form (LEFT TOP RIGHT BOTTOM).
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
613 TOP and BOTTOM count by lines, and LEFT and RIGHT count by columns,
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
614 all relative to 0, 0 at top left corner of frame.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
615
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
616 RIGHT is one more than the rightmost column occupied by WINDOW.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
617 BOTTOM is one more than the bottommost row occupied by WINDOW.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
618 The edges include the space used by WINDOW's scroll bar, display
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
619 margins, fringes, header line, and/or mode line. For the edges of
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
620 just the 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
621 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
622 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
623 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
624 register struct window *w = decode_any_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
626 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
627 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
628 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
629 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
630 Qnil))));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
631 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
633 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
634 doc: /* Return a list of the edge pixel coordinates of WINDOW.
105728
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
635 The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
636 the top left corner of the frame.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
637
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
638 RIGHT is one more than the rightmost x position occupied by WINDOW.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
639 BOTTOM is one more than the bottommost y position occupied by WINDOW.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
640 The pixel edges include the space used by WINDOW's scroll bar, display
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
641 margins, fringes, header line, and/or mode line. For the pixel edges
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
642 of just the text area, use `window-inside-pixel-edges'. */)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
643 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
644 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
645 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
646 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
647
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
648 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
649 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
650 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
651 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
652 Qnil))));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
653 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
654
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
655 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
656 doc: /* Return a list of the edge coordinates of WINDOW.
105728
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
657 The list has the form (LEFT TOP RIGHT BOTTOM).
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
658 TOP and BOTTOM count by lines, and LEFT and RIGHT count by columns,
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
659 all relative to 0, 0 at top left corner of frame.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
660
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
661 RIGHT is one more than the rightmost column of WINDOW's text area.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
662 BOTTOM is one more than the bottommost row of WINDOW's text area.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
663 The inside edges do not include the space used by the WINDOW's scroll
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
664 bar, display margins, fringes, header line, and/or mode line. */)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
665 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
666 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
667 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
668 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
669
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
670 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
671 + WINDOW_LEFT_MARGIN_COLS (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
672 + WINDOW_LEFT_FRINGE_COLS (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
673 make_number (WINDOW_TOP_EDGE_LINE (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
674 + 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
675 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
676 - WINDOW_RIGHT_MARGIN_COLS (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
677 - WINDOW_RIGHT_FRINGE_COLS (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
678 make_number (WINDOW_BOTTOM_EDGE_LINE (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
679 - WINDOW_MODE_LINE_LINES (w)));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
680 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
681
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
682 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
683 doc: /* Return a list of the edge pixel coordinates of WINDOW.
105728
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
684 The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
685 the top left corner of the frame.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
686
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
687 RIGHT is one more than the rightmost x position of WINDOW's text area.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
688 BOTTOM is one more than the bottommost y position of WINDOW's text area.
5cbf00ec9f94 * window.c (Fwindow_edges, Fwindow_pixel_edges)
Chong Yidong <cyd@stupidchicken.com>
parents: 105669
diff changeset
689 The inside edges do not include the space used by WINDOW's scroll bar,
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
690 display margins, fringes, header line, and/or mode line. */)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
691 (window)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
692 Lisp_Object window;
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
693 {
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
694 register struct window *w = decode_any_window (window);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
695
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
696 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
697 + WINDOW_LEFT_MARGIN_WIDTH (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
698 + WINDOW_LEFT_FRINGE_WIDTH (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
699 make_number (WINDOW_TOP_EDGE_Y (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
700 + 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
701 make_number (WINDOW_BOX_RIGHT_EDGE_X (w)
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
702 - WINDOW_RIGHT_MARGIN_WIDTH (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
703 - WINDOW_RIGHT_FRINGE_WIDTH (w)),
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
704 make_number (WINDOW_BOTTOM_EDGE_Y (w)
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
705 - WINDOW_MODE_LINE_HEIGHT (w)));
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
706 }
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
707
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
708 /* 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
709 If it is not, return ON_NOTHING;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
710 if it is in the window's text area,
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
711 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
712 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
713 return ON_TEXT;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
714 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
715 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
716 return ON_VERTICAL_BORDER.
56542
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
717 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
718 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
719 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
720 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
721 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
722 to window-relative coordinates;
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
723 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
724 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
725 to window-relative coordinates.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
726
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
727 X and Y are frame relative pixel coordinates. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
728
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
729 static enum window_part
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
730 coordinates_in_window (w, x, y)
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
731 register struct window *w;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
732 register int *x, *y;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
733 {
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
734 struct frame *f = XFRAME (WINDOW_FRAME (w));
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
735 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
736 enum window_part part;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
737 int ux = FRAME_COLUMN_WIDTH (f);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
738 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
739 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
740 /* 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
741 (Between mode lines for instance. */
f03dfbb443ce (coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents: 36068
diff changeset
742 int grabbable_width = ux;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
743 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
744
28918
e42cd428f056 (coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents: 28726
diff changeset
745 /* 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
746 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
747 if (w->pseudo_window_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
748 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
749 left_x = 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
750 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
751 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
752 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
753 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
754 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
755 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
756 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
757 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
758 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
759 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
760 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
761
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
762 /* Outside any interesting row? */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
763 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
764 return ON_NOTHING;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
765
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
766 /* 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
767 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
768 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
769 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
770 scroll bars. */
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
771
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
772 if (WINDOW_WANTS_MODELINE_P (w)
53129
070325c3884d (coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents: 52853
diff changeset
773 && *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
774 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
775 part = ON_MODE_LINE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
776
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
777 header_vertical_border_check:
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
778 /* 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
779 between mode lines of horizontally adjacent mode lines
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
780 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
781 return the right window. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
782 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
783 || WINDOW_RIGHTMOST_P (w))
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
784 {
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
785 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
786 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
787 /* 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
788 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
789 *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
790 *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
791 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
792 }
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
793 }
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
794 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
795 {
99745
b06d87fbe42d (coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents: 99541
diff changeset
796 /* Make sure we're not at the rightmost position of a
b06d87fbe42d (coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents: 99541
diff changeset
797 mode-/header-line and there's yet another window on
b06d87fbe42d (coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents: 99541
diff changeset
798 the right. (Bug#1372) */
b06d87fbe42d (coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents: 99541
diff changeset
799 if ((WINDOW_RIGHTMOST_P (w) || *x < x1)
b06d87fbe42d (coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents: 99541
diff changeset
800 && 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
801 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
802 /* 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
803 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
804 *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
805 *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
806 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
807 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
808 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
809
57309
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
810 if (*x < x0 || *x >= x1)
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
811 return ON_NOTHING;
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
812
51477
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
813 /* 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
814 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
815 *x -= x0;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
816 *y -= top_y;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
817 return part;
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
818 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
819
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
820 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
821 && *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
822 {
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
823 part = ON_HEADER_LINE;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
824 goto header_vertical_border_check;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
825 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
826
57309
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
827 if (*x < x0 || *x >= x1)
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
828 return ON_NOTHING;
d039bbffafbc (coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents: 57031
diff changeset
829
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
830 /* Outside any interesting column? */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
831 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
832 {
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
833 *y -= top_y;
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
834 return ON_SCROLL_BAR;
7810bc0b0259 (coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents: 65975
diff changeset
835 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
836
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
837 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
838 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
839
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
840 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
841 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
842
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
843 if (FRAME_WINDOW_P (f))
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
844 {
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
845 if (!w->pseudo_window_p
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
846 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
847 && !WINDOW_RIGHTMOST_P (w)
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
848 && (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
849 {
70058
12c8842436ef (window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents: 70042
diff changeset
850 /* 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
851 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
852 *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
853 *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
854 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
855 }
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
856 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
857 else
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
858 {
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
859 /* 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
860 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
861 if (!w->pseudo_window_p
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
862 && !WINDOW_RIGHTMOST_P (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
863 && *x > right_x - ux)
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
864 {
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
865 /* 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
866 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
867 *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
868 *y -= top_y;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
869 return ON_VERTICAL_BORDER;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
870 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
871 }
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
872
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
873 if (*x < text_left)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
874 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
875 if (lmargin_width > 0
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
876 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
877 ? (*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
878 : (*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
879 {
53129
070325c3884d (coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents: 52853
diff changeset
880 *x -= left_x;
51477
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
881 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
882 *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
883 *y -= top_y;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
884 return ON_LEFT_MARGIN;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
885 }
51207
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 /* 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
888 *x -= left_x;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
889 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
890 return ON_LEFT_FRINGE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
891 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
892
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
893 if (*x >= text_right)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
894 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
895 if (rmargin_width > 0
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
896 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
897 ? (*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
898 : (*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
899 {
66030
999beda71a39 (coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents: 66018
diff changeset
900 *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
901 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
902 *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
903 *y -= top_y;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
904 return ON_RIGHT_MARGIN;
3ee34a66739e (coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents: 51427
diff changeset
905 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
906
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
907 /* 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
908 *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
909 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
910 return ON_RIGHT_FRINGE;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
911 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
912
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
913 /* 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
914 *x -= text_left;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
915 *y -= top_y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
916 return ON_TEXT;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
917 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
918
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
919
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
920 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
921 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
922 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
923 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
924 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
925 \(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
926 frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
927 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
928 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
929 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
930 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
931 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
932 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
933 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
934 `vertical-line' is returned.
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
935 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
936 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
937 (coordinates, window)
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
938 register Lisp_Object coordinates, window;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
939 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
940 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
941 struct frame *f;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
942 int x, y;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
943 Lisp_Object lx, ly;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
944
53492
6861a5210fdb (decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 53143
diff changeset
945 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
946 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
947 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
948 CHECK_CONS (coordinates);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
949 lx = Fcar (coordinates);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
950 ly = Fcdr (coordinates);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
951 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
952 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
953 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
954 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
955
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
956 switch (coordinates_in_window (w, &x, &y))
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
957 {
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
958 case ON_NOTHING:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
959 return Qnil;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
960
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
961 case ON_TEXT:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
962 /* 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
963 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
964 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
965 FRAME_CANON_Y_FROM_PIXEL_Y (f, y));
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
966
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
967 case ON_MODE_LINE:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
968 return Qmode_line;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
969
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
970 case ON_VERTICAL_BORDER:
732
a8d94735277e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 722
diff changeset
971 return Qvertical_line;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
972
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
973 case ON_HEADER_LINE:
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
974 return Qheader_line;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
975
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
976 case ON_LEFT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
977 return Qleft_fringe;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
978
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
979 case ON_RIGHT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
980 return Qright_fringe;
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
981
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
982 case ON_LEFT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
983 return Qleft_margin;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
984
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
985 case ON_RIGHT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
986 return Qright_margin;
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
987
56542
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
988 case ON_SCROLL_BAR:
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
989 /* 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
990 return Qnil;
6d2d9477f39e (coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents: 56540
diff changeset
991
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
992 default:
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
993 abort ();
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
994 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
995 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
996
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
997
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
998 /* 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
999 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
1000 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
1001
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1002 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
1003 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
1004 *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
1005 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
1006
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1007 struct check_window_data
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1008 {
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1009 Lisp_Object *window;
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1010 int *x, *y;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1011 enum window_part *part;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1012 };
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1013
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1014 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1015 check_window_containing (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1016 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1017 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1018 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1019 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
1020 enum window_part found;
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
1021 int continue_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1022
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1023 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
1024 if (found != ON_NOTHING)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1025 {
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1026 *cw->part = found;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1027 XSETWINDOW (*cw->window, w);
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
1028 continue_p = 0;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1029 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1030
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
1031 return continue_p;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1032 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1033
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1034
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1035 /* 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
1036 return it as a Lisp_Object.
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1037
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1038 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
1039 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
1040 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
1041
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1042 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
1043 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
1044
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1045 This function was previously implemented with a loop cycling over
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1046 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
1047 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
1048 implementation of next_window using Vwindow_list, because
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1049 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
1050 tree of F when this function is called asynchronously from
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1051 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
1052 case. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1053
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1054 Lisp_Object
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1055 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
1056 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1057 int x, y;
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1058 enum window_part *part;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1059 int *wx, *wy;
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
1060 int tool_bar_p;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1062 Lisp_Object window;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1063 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
1064 enum window_part dummy;
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1065
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1066 if (part == 0)
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1067 part = &dummy;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1068
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1069 window = Qnil;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1070 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
1071 foreach_window (f, check_window_containing, &cw);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1072
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1073 /* 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
1074 bar exists. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1075 if (NILP (window)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1076 && tool_bar_p
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1077 && WINDOWP (f->tool_bar_window)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1078 && 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
1079 && (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
1080 != ON_NOTHING))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1081 {
50233
e25cbad07868 * window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents: 49836
diff changeset
1082 *part = ON_TEXT;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1083 window = f->tool_bar_window;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1084 }
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
1085
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1086 if (wx) *wx = x;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1087 if (wy) *wy = y;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1088
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1089 return window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1091
681
026f978690be *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 555
diff changeset
1092 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
1093 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
1094 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
1095 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
1096 column 0. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1097 (x, y, frame)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1098 Lisp_Object x, y, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1099 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1100 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1102 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
1103 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1104 CHECK_LIVE_FRAME (frame);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1105 f = XFRAME (frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1106
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1107 /* 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
1108 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
1109 CHECK_NUMBER_OR_FLOAT (y);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1110
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1111 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
1112 (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
1113 + 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
1114 (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
1115 + FRAME_INTERNAL_BORDER_WIDTH (f)),
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1116 0, 0, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1119 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
1120 doc: /* Return current value of point in WINDOW.
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1121 WINDOW defaults to the selected window.
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1122
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1123 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
1124 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
1125
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1126 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
1127 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
1128 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
1129 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
1130 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
1131 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1132 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1133 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1134 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1135
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1136 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 && current_buffer == XBUFFER (w->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1138 return Fpoint ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1139 return Fmarker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1140 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1141
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 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
1143 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
1144 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
1145 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
1146 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1149 return Fmarker_position (decode_window (window)->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1151
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1152 /* 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
1153
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1154 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
1155 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
1156 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
1157 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
1158 (save-excursion
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1159 (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
1160 (vertical-motion (1- (window-height window)) window)
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1161 (point))") */
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1162
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1163 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
1164 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
1165 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
1166 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
1167 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
1168 does not update this value.
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
1169 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
1170 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
1171 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
1172 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
1173 (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
1174 Lisp_Object window, update;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1176 Lisp_Object value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1177 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
1178 Lisp_Object buf;
72998
79ada95d4018 (Fwindow_end): Fix recent change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72990
diff changeset
1179 struct buffer *b;
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1180
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1181 buf = w->buffer;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1182 CHECK_BUFFER (buf);
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1183 b = XBUFFER (buf);
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1184
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1185 #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
1186 /* 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
1187 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
1188 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
1189 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
1190 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
1191 return Qnil;
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1192 #endif
8492
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1193
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1194 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
1195 && ! (! 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
1196 && XFASTINT (w->last_modified) >= BUF_MODIFF (b)
75080
1026dad5d8c9 (Fwindow_end): Fix use of >= operator.
Juanma Barranquero <lekktu@gmail.com>
parents: 75077
diff changeset
1197 && 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
1198 && !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
1199 {
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1200 struct text_pos startp;
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1201 struct it it;
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1202 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
1203
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1204 /* 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
1205 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
1206 if (b != current_buffer)
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1207 {
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1208 old_buffer = current_buffer;
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1209 set_buffer_internal (b);
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1210 }
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1211
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1212 /* 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
1213 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
1214 `-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
1215 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
1216 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
1217 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
1218 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
1219 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
1220 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
1221 else
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1222 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
1223
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1224 start_display (&it, w, startp);
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1225 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
1226 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
1227 move_it_past_eol (&it);
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1228 value = make_number (IT_CHARPOS (it));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1229
36231
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1230 if (old_buffer)
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1231 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
1232 }
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1233 else
72907
b9f52d5446b1 (Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents: 72663
diff changeset
1234 XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 return value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1238
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239 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
1240 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
1241 Return POS. */)
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)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 Lisp_Object window, pos;
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);
24230
ee835eec7607 (Fset_window_point): If WINDOW is selected but the
Richard M. Stallman <rms@gnu.org>
parents: 23728
diff changeset
1248 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
1249 && XBUFFER (w->buffer) == current_buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 Fgoto_char (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 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
1253
34615
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1254 /* 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
1255 the new value of point. */
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1256 if (!EQ (window, selected_window))
34491
f9d400d4653a (Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents: 34417
diff changeset
1257 ++windows_or_buffers_changed;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
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
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1262 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
1263 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
1264 WINDOW defaults to the selected window. Return POS.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1265 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
1266 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
1267 (window, pos, noforce)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 Lisp_Object window, pos, noforce;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1269 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1271
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1272 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273 set_marker_restricted (w->start, pos, w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274 /* this is not right, but much easier than doing what is right. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1275 w->start_at_line_beg = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1276 if (NILP (noforce))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1277 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1278 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
1279 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
1280 XSETFASTINT (w->last_overlay_modified, 0);
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1281 if (!EQ (window, selected_window))
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1282 windows_or_buffers_changed++;
25387
df0083768b79 (Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents: 25375
diff changeset
1283
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1284 return pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1287
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1288 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
1289 0, 1, 0,
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1290 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
1291 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
1292 `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
1293 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
1294 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
1295 the selected window.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1296
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1297 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
1298 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
1299 `get-largest-window' treat dedicated windows specially.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1300 `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
1301 `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
1302
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1303 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
1304 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
1305 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
1306 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 return decode_window (window)->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1311
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1312 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p,
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1313 Sset_window_dedicated_p, 2, 2, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1314 doc: /* Mark WINDOW as dedicated according to FLAG.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1315 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
1316 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
1317 Return FLAG.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1318
99160
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1319 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
1320 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
1321 `get-largest-window' treat dedicated windows specially.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1322 `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
1323 `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
1324 frame.
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1325
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
1326 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
1327 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
1328 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
1329 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
1330 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
1331 (window, flag)
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1332 Lisp_Object window, flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1333 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1334 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1336 w->dedicated = flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 return w->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1339
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1340
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1341 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
1342 0, 1, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1343 doc: /* Return the parameters of WINDOW and their values.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1344 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
1345 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
1346 (window)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1347 Lisp_Object window;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1348 {
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1349 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
1350 }
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1351
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1352 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
1353 2, 2, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1354 doc: /* Return WINDOW's value for PARAMETER.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1355 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
1356 (window, parameter)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1357 Lisp_Object window, parameter;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1358 {
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1359 Lisp_Object result;
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1360
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1361 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
1362 return CDR_SAFE (result);
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1363 }
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1364
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1365 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
1366 Sset_window_parameter, 3, 3, 0,
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1367 doc: /* Set WINDOW's value of PARAMETER to VALUE.
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
1368 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
1369 (window, parameter, value)
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1370 Lisp_Object window, parameter, value;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1371 {
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1372 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
1373 Lisp_Object old_alist_elt;
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1374
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1375 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
1376 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
1377 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
1378 else
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1379 Fsetcdr (old_alist_elt, value);
95564
823072be49ad (Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents: 95550
diff changeset
1380 return value;
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1381 }
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1382
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
1383
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1384 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1385 0, 1, 0,
75753
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1386 doc: /* Return the display-table that WINDOW is using.
5e34b32b9b4c (Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents: 75348
diff changeset
1387 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
1388 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391 return decode_window (window)->display_table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1392 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1394 /* 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
1395 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
1396 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
1397 return 0. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1398
13187
1a4cee562d33 (window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents: 13126
diff changeset
1399 struct Lisp_Char_Table *
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 window_display_table (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 {
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1403 struct Lisp_Char_Table *dp = NULL;
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1404
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1405 if (DISP_TABLE_P (w->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1406 dp = XCHAR_TABLE (w->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1407 else if (BUFFERP (w->buffer))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1408 {
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1409 struct buffer *b = XBUFFER (w->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1410
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1411 if (DISP_TABLE_P (b->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1412 dp = XCHAR_TABLE (b->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1413 else if (DISP_TABLE_P (Vstandard_display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1414 dp = XCHAR_TABLE (Vstandard_display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1415 }
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1416
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1417 return dp;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1418 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1419
555
e09a318cf838 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 548
diff changeset
1420 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
1421 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
1422 (window, table)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423 register Lisp_Object window, table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1425 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1426
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427 w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 w->display_table = table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429 return table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432 /* Record info on buffer window w is displaying
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 when it is about to cease to display that buffer. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1434 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1435 unshow_buffer (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 {
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1438 Lisp_Object buf;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1439 struct buffer *b;
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1440
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1441 buf = w->buffer;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1442 b = XBUFFER (buf);
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1443 if (b != XMARKER (w->pointm)->buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 abort ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445
5990
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1446 #if 0
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1447 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448 || ! EQ (buf, XWINDOW (selected_window)->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 /* Do this except when the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450 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
1451 #endif
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1452 /* 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
1453 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
1454 Now that this statement is unconditional,
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1455 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
1456 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
1457 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
1458 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
1459 b->last_window_start = marker_position (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461 /* Point in the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1462 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
1463 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
1464 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
1465 /* 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
1466 && !(WINDOWP (b->last_selected_window)
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1467 && w != XWINDOW (b->last_selected_window)
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
1468 && 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
1469 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
1470 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
1471 XMARKER (w->pointm)->charpos,
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1472 BUF_ZV (b)),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1473 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
1474 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
1475 BUF_ZV_BYTE (b)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1476
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1477 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
1478 && 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
1479 b->last_selected_window = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1481
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 /* Put replacement into the window structure in place of old. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1483 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1484 replace_window (old, replacement)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1485 Lisp_Object old, replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1490 /* 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
1491 root_window for that frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492
1525
f79a22ad87d0 * window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents: 1444
diff changeset
1493 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame))))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1494 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1495
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1496 p->left_col = o->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1497 p->top_line = o->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1498 p->total_cols = o->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1499 p->total_lines = o->total_lines;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1500 p->desired_matrix = p->current_matrix = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1501 p->vscroll = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1502 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1503 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1504 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1505 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
1506 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1507 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1508 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1509 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1510 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1511 p->window_end_valid = Qnil;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
1512 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
1513 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1514
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1515 p->next = tem = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1516 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517 XWINDOW (tem)->prev = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1518
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1519 p->prev = tem = o->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1520 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1521 XWINDOW (tem)->next = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1522
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 p->parent = tem = o->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1524 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526 if (EQ (XWINDOW (tem)->vchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527 XWINDOW (tem)->vchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 if (EQ (XWINDOW (tem)->hchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 XWINDOW (tem)->hchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1530 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 /*** Here, if replacement is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 and so is its new parent, we should make replacement's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 children be children of that parent instead. ***/
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1537 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "",
99210
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
1538 doc: /* Remove WINDOW from its frame.
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
1539 WINDOW defaults to the selected window. Return nil.
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
1540 Signal an error when WINDOW is the only window on its frame. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1541 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 {
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1544 struct frame *f;
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1545 if (NILP (window))
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1546 window = selected_window;
105404
60888a525c1b * window.c (Fdelete_window): Check WINDOW argument. (Bug#4618)
Juanma Barranquero <lekktu@gmail.com>
parents: 103557
diff changeset
1547 else
60888a525c1b * window.c (Fdelete_window): Check WINDOW argument. (Bug#4618)
Juanma Barranquero <lekktu@gmail.com>
parents: 103557
diff changeset
1548 CHECK_LIVE_WINDOW (window);
60888a525c1b * window.c (Fdelete_window): Check WINDOW argument. (Bug#4618)
Juanma Barranquero <lekktu@gmail.com>
parents: 103557
diff changeset
1549
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1550 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1551 delete_window (window);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1552
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1553 run_window_configuration_change_hook (f);
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1554
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1555 return Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1556 }
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1557
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
1558 void
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1559 delete_window (window)
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1560 register Lisp_Object window;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1561 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562 register Lisp_Object tem, parent, sib;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1563 register struct window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 register struct window *par;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1565 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1567 /* 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
1568 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
1569 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
1570 CHECK_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1571 p = XWINDOW (window);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1572
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1573 /* 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
1574 if (NILP (p->buffer)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1575 && NILP (p->hchild)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1576 && NILP (p->vchild))
17365
fc2ec9ced22f (delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents: 17281
diff changeset
1577 return;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1578
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1579 parent = p->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1580 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1581 error ("Attempt to delete minibuffer or sole ordinary window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1582 par = XWINDOW (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1583
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584 windows_or_buffers_changed++;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1585 Vwindow_list = Qnil;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1586 f = XFRAME (WINDOW_FRAME (p));
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1587 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1588
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1589 /* 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
1590 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1591 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
1592
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1593 /* 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
1594 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
1595 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
1596 swindow = FRAME_SELECTED_WINDOW (f);
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1597
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1598 while (1)
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1599 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1600 pwindow = swindow;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1601 while (!NILP (pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1602 {
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1603 if (EQ (window, pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1604 break;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1605 pwindow = XWINDOW (pwindow)->parent;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1606 }
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1607
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1608 /* 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
1609 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
1610 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
1611 break;
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1612 /* Otherwise, try another window for SWINDOW. */
77905
2fd30dc1a157 (delete_window): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents: 77883
diff changeset
1613 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
1614
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1615 /* 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
1616 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
1617 so we cannot delete. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1618 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
1619 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
1620 }
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1621
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1622 /* 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
1623 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
1624 {
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1625 /* 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
1626 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
1627 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
1628 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
1629 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
1630 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
1631 Fselect_window (swindow, Qnil);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1632 else
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1633 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
1634 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1635 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1637 /* 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
1638 window_deletion_count++;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
1639
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 tem = p->buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 /* tem is null for dummy parent windows
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642 (which have inferiors but not any contents themselves) */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1643 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 unshow_buffer (p);
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
1646 unchain_marker (XMARKER (p->pointm));
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
1647 unchain_marker (XMARKER (p->start));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1649
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1650 /* 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
1651 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
1652 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
1653 processed while we are changing them. */
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1654 BLOCK_INPUT;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1655 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1656
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657 tem = p->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1658 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1659 XWINDOW (tem)->prev = p->prev;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1660
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1661 tem = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1662 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 XWINDOW (tem)->next = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1664
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1665 if (EQ (window, par->hchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1666 par->hchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1667 if (EQ (window, par->vchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1668 par->vchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1670 /* Find one of our siblings to give our space to. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1671 sib = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1672 if (NILP (sib))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1673 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1674 /* If p gives its space to its next sibling, that sibling needs
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1675 to have its top/left side pulled back to where p's is.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1676 set_window_{height,width} will re-position the sibling's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1677 children. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1678 sib = p->next;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1679 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
1680 XWINDOW (sib)->left_col = p->left_col;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1681 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1682
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683 /* Stretch that sibling. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1684 if (!NILP (par->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1685 set_window_height (sib,
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1686 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1687 1);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1688 if (!NILP (par->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1689 set_window_width (sib,
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
1690 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1691 1);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1692
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1693 /* If parent now has only one child,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1694 put the child into the parent's place. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1695 tem = par->hchild;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1696 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1697 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
1698 if (NILP (XWINDOW (tem)->next)) {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 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
1700 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
1701 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1702
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1703 /* 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
1704 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
1705 if (! NILP (p->hchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1706 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
1707 else if (! NILP (p->vchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1708 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
1709
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1710 /* Mark this window as deleted. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1711 p->buffer = p->hchild = p->vchild = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1712
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
1713 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
1714 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
1715
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 /* 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
1717 one of them. */
64133
7e06f331c228 (Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents: 64114
diff changeset
1718
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
1719 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
1720 {
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 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
1722 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
1723 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
1724 }
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 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
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 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
1728 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
1729 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
1730 }
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1731 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
1732 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
1733
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1734 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
1735 {
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1736 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
1737 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
1738 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
1739 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
1740 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
1741 }
872de430453e * window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents: 62544
diff changeset
1742 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
1743 /* 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
1744 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
1745 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
1746 |
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
1747 -> 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
1748 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
1749 */
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
1750 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
1751 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
1752 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
1753 }
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
1754 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
1755 }
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
1756
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
1757
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1758 /* Adjust glyph matrices. */
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1759 adjust_glyphs (f);
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1760 UNBLOCK_INPUT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1761 }
30037
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
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1764
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1765 /***********************************************************************
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1766 Window List
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1767 ***********************************************************************/
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1768
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1769 /* 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
1770 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
1771 function window_list. */
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1772
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1773 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1774 add_window_to_list (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1775 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1776 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1777 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1778 Lisp_Object *list = (Lisp_Object *) user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1779 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1780 XSETWINDOW (window, w);
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1781 *list = Fcons (window, *list);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1782 return 1;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1783 }
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 /* 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
1787 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
1788 list, cache it in Vwindow_list, and return that. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1789
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1790 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1791 window_list ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1792 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1793 if (!CONSP (Vwindow_list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1794 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1795 Lisp_Object tail;
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1796
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1797 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1798 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
1799 {
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1800 Lisp_Object args[2];
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1801
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1802 /* 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
1803 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
1804 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
1805 args[1] = Qnil;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1806 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
1807 args[0] = Vwindow_list;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1808 args[1] = Fnreverse (args[1]);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1809 Vwindow_list = Fnconc (2, args);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1810 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1811 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1812
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1813 return Vwindow_list;
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
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1816
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1817 /* 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
1818 OWINDOW, MINIBUF and ALL_FRAMES.
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1819
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1820 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
1821 `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
1822 a window means a specific minibuffer window
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1823
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1824 ALL_FRAMES t means search all frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1825 nil means search just current frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1826 `visible' means search just visible frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1827 0 means search visible and iconified frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1828 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
1829 a frame means consider windows on that frame, only. */
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1830
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1831 static int
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1832 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
1833 Lisp_Object window, owindow, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1834 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1835 struct window *w = XWINDOW (window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1836 struct frame *f = XFRAME (w->frame);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1837 int candidate_p = 1;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1838
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1839 if (!BUFFERP (w->buffer))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1840 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1841 else if (MINI_WINDOW_P (w)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1842 && (EQ (minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1843 || (WINDOWP (minibuf) && !EQ (minibuf, window))))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1844 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1845 /* If MINIBUF is `lambda' don't consider any mini-windows.
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1846 If it is a window, consider only that one. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1847 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1848 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1849 else if (EQ (all_frames, Qt))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1850 candidate_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1851 else if (NILP (all_frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1852 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1853 xassert (WINDOWP (owindow));
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1854 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
1855 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1856 else if (EQ (all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1857 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1858 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
1859 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
1860 && (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
1861 == 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
1862
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1863 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1864 else if (INTEGERP (all_frames) && XINT (all_frames) == 0)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1865 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1866 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
1867 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
1868 #ifdef HAVE_X_WINDOWS
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
1869 /* 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
1870 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
1871 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
1872 `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
1873 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
1874 that yet. --Stef */
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
1875 || (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
1876 && !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
1877 #endif
85010
a3defcbdb064 (candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84758
diff changeset
1878 )
a3defcbdb064 (candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84758
diff changeset
1879 && (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
1880 == FRAME_TERMINAL (XFRAME (selected_frame)));
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1881 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1882 else if (WINDOWP (all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1883 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1884 || EQ (XWINDOW (all_frames)->frame, w->frame)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1885 || 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
1886 else if (FRAMEP (all_frames))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1887 candidate_p = EQ (all_frames, w->frame);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1888
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1889 return candidate_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1890 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1891
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1892
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1893 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1894 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
1895 ALL_FRAMES. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1896
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1897 static void
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1898 decode_next_window_args (window, minibuf, all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1899 Lisp_Object *window, *minibuf, *all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1900 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1901 if (NILP (*window))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1902 *window = selected_window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1903 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1904 CHECK_LIVE_WINDOW (*window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1905
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1906 /* 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
1907 does. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1908 if (NILP (*minibuf))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1909 *minibuf = minibuf_level ? minibuf_window : Qlambda;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1910 else if (!EQ (*minibuf, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1911 *minibuf = Qlambda;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1912
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1913 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda'
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1914 => count none of them, or a specific minibuffer window (the
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1915 active one) to count. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1916
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1917 /* ALL_FRAMES nil doesn't specify which frames to include. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1918 if (NILP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1919 *all_frames = (!EQ (*minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1920 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1921 : Qnil);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1922 else if (EQ (*all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1923 ;
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
1924 else if (EQ (*all_frames, make_number (0)))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1925 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1926 else if (FRAMEP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1927 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1928 else if (!EQ (*all_frames, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1929 *all_frames = Qnil;
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 /* 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
1932 search just current frame, `visible' meaning search just visible
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1933 frames, 0 meaning search visible and iconified frames, or a
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1934 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
1935 frame, meaning consider windows on that frame, only. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1936 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1937
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1938
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
1939 /* Return the next or previous window of WINDOW in cyclic ordering
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1940 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
1941 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
1942 ALL_FRAMES. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1943
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1944 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1945 next_window (window, minibuf, all_frames, next_p)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1946 Lisp_Object window, minibuf, all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1947 int next_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1948 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1949 decode_next_window_args (&window, &minibuf, &all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1950
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1951 /* 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
1952 return the first window on the frame. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1953 if (FRAMEP (all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1954 && !EQ (all_frames, XWINDOW (window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1955 return Fframe_first_window (all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1956
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1957 if (next_p)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1958 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1959 Lisp_Object list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1960
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1961 /* Find WINDOW in the list of all windows. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1962 list = Fmemq (window, window_list ());
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 /* 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
1965 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1966 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
1967 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
1968 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1969
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1970 /* 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
1971 if (!CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1972 for (list = Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1973 CONSP (list) && !EQ (XCAR (list), window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1974 list = XCDR (list))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1975 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
1976 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1977
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1978 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1979 window = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1980 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1981 else
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1982 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1983 Lisp_Object candidate, list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1984
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1985 /* 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
1986 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
1987 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
1988 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
1989 candidate = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1990 for (list = window_list (); CONSP (list); list = XCDR (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1991 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1992 if (EQ (XCAR (list), window))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1993 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1994 if (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1995 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1996 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1997 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
1998 all_frames))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1999 candidate = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2000 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2001
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2002 if (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2003 window = candidate;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2004 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2005
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2006 return window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2007 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2008
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
2009
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2010 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2011 doc: /* Return window following WINDOW in cyclic ordering of windows.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2012 WINDOW defaults to the selected window. The optional arguments
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2013 MINIBUF and ALL-FRAMES specify the set of windows to consider.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2014
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2015 MINIBUF t means consider the minibuffer window even if the
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2016 minibuffer is not active. MINIBUF nil or omitted means consider
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2017 the minibuffer window only if the minibuffer is active. Any
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2018 other value means do not consider the minibuffer window even if
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2019 the minibuffer is active.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2020
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2021 Several frames may share a single minibuffer; if the minibuffer
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2022 is active, all windows on all frames that share that minibuffer
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2023 are considered too. Therefore, if you are using a separate
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2024 minibuffer frame and the minibuffer is active and MINIBUF says it
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2025 counts, `next-window' considers the windows in the frame from
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2026 which you entered the minibuffer, as well as the minibuffer
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2027 window.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2028
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2029 ALL-FRAMES nil or omitted means consider all windows on WINDOW's
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2030 frame, plus the minibuffer window if specified by the MINIBUF
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2031 argument, see above. If the minibuffer counts, consider all
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2032 windows on all frames that share that minibuffer too.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2033 ALL-FRAMES t means consider all windows on all existing frames.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2034 ALL-FRAMES `visible' means consider all windows on all visible
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2035 frames.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2036 ALL-FRAMES 0 means consider all windows on all visible and
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2037 iconified frames.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2038 ALL-FRAMES a frame means consider all windows on that frame only.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2039 Anything else means consider all windows on WINDOW's frame and no
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2040 others.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2041
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2042 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
2043 `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
2044 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
2045 `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
2046 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2047 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2048 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2049 return next_window (window, minibuf, all_frames, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2050 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2051
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2052
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2053 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2054 doc: /* Return window preceding WINDOW in cyclic ordering of windows.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2055 WINDOW defaults to the selected window. The optional arguments
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2056 MINIBUF and ALL-FRAMES specify the set of windows to consider.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2057 For the precise meaning of these arguments see `next-window'.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2058
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2059 If you use consistent values for MINIBUF and ALL-FRAMES, you can
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2060 use `previous-window' to iterate through the entire cycle of
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2061 acceptable windows, eventually ending up back at the window you
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2062 started with. `next-window' traverses the same cycle, in the
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2063 reverse order. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2064 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2065 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2066 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2067 return next_window (window, minibuf, all_frames, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2068 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2069
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2070
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
2071 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p",
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2072 doc: /* Select another window in cyclic ordering of windows.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2073 COUNT specifies the number of windows to skip, starting with the
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2074 selected window, before making the selection. If COUNT is
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2075 positive, skip COUNT windows forwards. If COUNT is negative,
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2076 skip -COUNT windows backwards. COUNT zero means do not skip any
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2077 window, so select the selected window. In an interactive call,
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2078 COUNT is the numeric prefix argument. Return nil.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2079
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2080 This function uses `next-window' for finding the window to select.
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2081 The argument ALL-FRAMES has the same meaning as in `next-window',
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2082 but the MINIBUF argument of `next-window' is always effectively
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2083 nil. */)
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2084 (count, all_frames)
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2085 Lisp_Object count, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2086 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2087 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2088 int i;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2089
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2090 CHECK_NUMBER (count);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2091 window = selected_window;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2092
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2093 for (i = XINT (count); i > 0; --i)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2094 window = Fnext_window (window, Qnil, all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2095 for (; i < 0; ++i)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2096 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
2097
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
2098 Fselect_window (window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2100 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2101
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2102
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2103 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
2104 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
2105 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
2106 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
2107 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
2108 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
2109 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
2110 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
2111 (frame, minibuf, window)
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2112 Lisp_Object frame, minibuf, window;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2113 {
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2114 if (NILP (window))
69104
527507f1a62e (Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68987
diff changeset
2115 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
2116 CHECK_WINDOW (window);
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2117 if (NILP (frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2118 frame = selected_frame;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2119
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2120 if (!EQ (frame, XWINDOW (window)->frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2121 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
2122
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2123 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
2124 }
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2125
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2126
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
2127 /* Return a list of windows in cyclic ordering. Arguments are like
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2128 for `next-window'. */
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2129
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2130 static Lisp_Object
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2131 window_list_1 (window, minibuf, all_frames)
30265
9b1c8eafe4dc (Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents: 30102
diff changeset
2132 Lisp_Object window, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2133 {
56456
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2134 Lisp_Object tail, list, rest;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2135
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2136 decode_next_window_args (&window, &minibuf, &all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2137 list = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2138
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2139 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
2140 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
2141 list = Fcons (XCAR (tail), list);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2142
56456
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2143 /* 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
2144 list = Fnreverse (list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2145 rest = Fmemq (window, list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2146 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
2147 {
56616
76bd0e931318 (window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56585
diff changeset
2148 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
2149 ;
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2150 XSETCDR (tail, Qnil);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2151 list = nconc2 (rest, list);
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2152 }
7f86a9a89685 (coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents: 56393
diff changeset
2153 return list;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2154 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2155
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
2156
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2157
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2158 /* Look at all windows, performing an operation specified by TYPE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2159 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
2160 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
2161 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
2162 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
2163 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
2164 If MINI is non-zero, perform the operation on minibuffer windows too. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2165
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2166 enum window_loop
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2167 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2168 WINDOW_LOOP_UNUSED,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2169 GET_BUFFER_WINDOW, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2170 GET_LRU_WINDOW, /* Arg is t for full-width windows only */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2171 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2172 DELETE_BUFFER_WINDOWS, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2173 GET_LARGEST_WINDOW,
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2174 UNSHOW_BUFFER, /* Arg is buffer */
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2175 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
2176 CHECK_ALL_WINDOWS
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2177 };
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2178
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 static Lisp_Object
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2180 window_loop (type, obj, mini, frames)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181 enum window_loop type;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2182 Lisp_Object obj, frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2183 int mini;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2184 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2185 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
2186 struct frame *f;
30102
9406cb07bac7 (window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30093
diff changeset
2187 struct gcpro gcpro1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2188
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2189 /* If we're only looping through windows on a particular frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2190 frame points to that frame. If we're looping through windows
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2191 on all frames, frame is 0. */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2192 if (FRAMEP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2193 f = XFRAME (frames);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2194 else if (NILP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2195 f = SELECTED_FRAME ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2196 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2197 f = NULL;
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 if (f)
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2200 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
2201 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
2202 frame_arg = frames;
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2203 else if (EQ (frames, Qvisible))
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2204 frame_arg = frames;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2205 else
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2206 frame_arg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2207
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2208 /* 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
2209 Qvisible to consider all visible frames,
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2210 or Qt otherwise. */
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
2211
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2212 /* 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
2213 if (WINDOWP (obj))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2214 window = obj;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2215 else if (f)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2216 window = FRAME_SELECTED_WINDOW (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2217 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2218 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
2219
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
2220 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
2221 GCPRO1 (windows);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2222 best_window = Qnil;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2223
67234
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
2224 for (; CONSP (windows); windows = XCDR (windows))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2226 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2227
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2228 window = XCAR (windows);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2229 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2230
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2231 /* 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
2232 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
2233 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
2234 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
2235 /* 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
2236 || type == UNSHOW_BUFFER
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237 || (mini && minibuf_level > 0))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2238 switch (type)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2239 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 case GET_BUFFER_WINDOW:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2241 if (EQ (w->buffer, obj)
16522
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
2242 /* Don't find any minibuffer window
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
2243 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
2244 && (MINI_WINDOW_P (w)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2245 ? EQ (window, minibuf_window)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2246 : 1))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2247 {
36068
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2248 if (NILP (best_window))
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2249 best_window = window;
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2250 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
2251 /* 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
2252 RETURN_UNGCPRO (window);
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
2253 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
2254 /* 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
2255 best_window = window;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2256 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2257 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2258
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2259 case GET_LRU_WINDOW:
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2260 /* `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
2261 `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
2262 `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
2263 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
2264 || (!(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
2265 /* Minibuffer windows are always ignored. */
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2266 || MINI_WINDOW_P (w))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2267 break;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2268 if (NILP (best_window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2269 || (XFASTINT (XWINDOW (best_window)->use_time)
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2270 > XFASTINT (w->use_time)))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2271 best_window = window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2272 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2273
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2274 case DELETE_OTHER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2275 if (!EQ (window, obj))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2276 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2277 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2278
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2279 case DELETE_BUFFER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2280 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2282 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
2283
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2284 /* 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
2285 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2286 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2287 && !NILP (w->dedicated)
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2288 && other_visible_frames (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2289 {
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2290 /* 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
2291 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2292 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2293 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2294 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2295 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2296
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2297 /* Now we can safely delete the frame. */
100632
389db2f016a4 * frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents: 99745
diff changeset
2298 delete_frame (w->frame, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2299 }
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2300 else if (NILP (w->parent))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2301 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2302 /* 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
2303 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
2304 display there. */
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 buffer = Fother_buffer (obj, Qnil, w->frame);
99541
8f3f7e087ae6 (window_loop): In DELETE_BUFFER_WINDOWS case, reset
Martin Rudalics <rudalics@gmx.at>
parents: 99322
diff changeset
2307 /* Reset dedicated state of window. */
8f3f7e087ae6 (window_loop): In DELETE_BUFFER_WINDOWS case, reset
Martin Rudalics <rudalics@gmx.at>
parents: 99322
diff changeset
2308 w->dedicated = Qnil;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2309 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2310 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2311 Fset_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2312 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2314 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2315 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2316 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2317
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2318 case GET_LARGEST_WINDOW:
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2319 { /* 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
2320 /* 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
2321 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
2322 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2323
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2324 if (NILP (best_window))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2325 best_window = window;
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2326 else
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2327 {
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2328 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
2329 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
2330 > 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
2331 best_window = window;
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2332 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336 case UNSHOW_BUFFER:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2337 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2338 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2339 Lisp_Object buffer;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2340 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2341
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342 /* 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
2343 buffer = Fother_buffer (obj, Qnil, w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2344
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2345 /* 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
2346 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2347 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2348 && !NILP (w->dedicated)
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2349 && other_visible_frames (f))
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2350 {
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2351 /* Skip the other windows on this frame.
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2352 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2353 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2354 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2355 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2356 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2357
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2358 /* Now we can safely delete the frame. */
100632
389db2f016a4 * frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents: 99745
diff changeset
2359 delete_frame (w->frame, Qnil);
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2360 }
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2361 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
2362 {
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2363 Lisp_Object window;
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2364 XSETWINDOW (window, w);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2365 /* 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
2366 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
2367 Fdelete_window (window);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2368 }
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2369 else
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2370 {
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2371 /* 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
2372 w->dedicated = Qnil;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2373 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2374 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2375 Fset_buffer (w->buffer);
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2376 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2377 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2378 break;
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2379
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2380 case REDISPLAY_BUFFER_WINDOWS:
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2381 if (EQ (w->buffer, obj))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2382 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2383 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
2384 w->update_mode_line = Qt;
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
2385 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
2386 ++update_mode_lines;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2387 best_window = window;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2388 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2389 break;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
2390
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2391 /* 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
2392 case CHECK_ALL_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2393 if (! NILP (w->buffer)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2394 && NILP (XBUFFER (w->buffer)->name))
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2395 abort ();
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2396 break;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2397
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2398 case WINDOW_LOOP_UNUSED:
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2399 break;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2400 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2401 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2402
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2403 UNGCPRO;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2404 return best_window;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
2405 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2406
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2407 /* 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
2408
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2409 void
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2410 check_all_windows ()
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2411 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2412 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
2413 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2414
66598
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2415 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
2416 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
2417 \(LRU means Least Recently Used.)
91cecb8739e7 (Fget_lru_window): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76310
diff changeset
2418
54883
375346b8175c (Fget_lru_window): Doc fix.
Nick Roberts <nickrob@snap.net.nz>
parents: 54267
diff changeset
2419 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
2420 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
2421 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
2422 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
2423 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
2424 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
2425 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
2426 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
2427 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
2428 (frame, dedicated)
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2429 Lisp_Object frame, dedicated;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2430 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431 register Lisp_Object w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 /* 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
2433 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
2434 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
2435 0, frame);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2436 if (!NILP (w) && !EQ (w, selected_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2437 return w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438 /* 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
2439 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
2440 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
2441 0, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443
66598
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2444 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
2445 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
2446 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
2447 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
2448 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
2449 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
2450 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
2451 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
2452 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
2453 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
2454 (frame, dedicated)
bc45ad547d66 (window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66239
diff changeset
2455 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
2456 {
66711
d89d56f50d43 (Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66664
diff changeset
2457 return window_loop (GET_LARGEST_WINDOW, dedicated, 0,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2458 frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2459 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2460
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2461 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
2462 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
2463 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
2464 current buffer.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2465 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
2466 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
2467 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
2468 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
2469 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
2470 (buffer_or_name, frame)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2471 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
2472 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2473 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2474
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2475 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
2476 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2477 else
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2478 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
2479
9105
984a4b1be1d1 (Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents: 9028
diff changeset
2480 if (BUFFERP (buffer))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2481 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2485
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2486 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
2487 0, 1, "",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2488 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
2489 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
2490 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
2491 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
2492 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
2493 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
2494 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
2495 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2496 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2497 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2498 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
2499 int startpos;
35038
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2500 int top, new_top;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2501
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2502 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2503 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2504 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2505 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2506 w = XWINDOW (window);
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2507
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2508 startpos = marker_position (w->start);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2509 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
2510
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2511 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
2512 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
2513
2190
482c7827b968 (Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
2514 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2516 /* 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
2517 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
2518 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
2519 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
2520 not current, due to typeahead). */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2521 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
2522 if (new_top != top
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2523 && 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
2524 && 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
2525 {
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2526 struct position pos;
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2527 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
2528
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2529 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
2530 /* 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
2531 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
2532 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
2533
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
2534 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
2535 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
2536 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
2537 || 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
2538 : Qnil);
13198
43d90596da34 (Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents: 13187
diff changeset
2539 /* 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
2540 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
2541 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
2542
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2543 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
2544 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2545
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2546 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2547 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2548
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549 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
2550 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
2551 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
2552 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
2553 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
2554
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2555 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
2556 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
2557 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
2558 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
2559 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
2560 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
2561 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
2562 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
2563 (buffer_or_name, frame)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2564 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
2565 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2566 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2567
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2568 /* 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
2569 expects. */
22223
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2570 if (NILP (frame))
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2571 frame = Qt;
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2572 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
2573 frame = Qnil;
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2574
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2575 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
2576 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2577 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2579 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
2580 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2582
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2583 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
2584
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2587
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588 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
2589 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
2590 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
2591 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
2592 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
2593 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
2594
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2595 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
2596 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
2597 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
2598 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
2599 (buffer_or_name)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2600 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
2601 {
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2602 Lisp_Object buffer;
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2603
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2604 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
2605 buffer = Fcurrent_buffer ();
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2606 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2607 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2608 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
2609 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2610 }
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2611
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
2612 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
2613
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2614 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2615 }
13918
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2616
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2617 /* 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
2618 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
2619
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2620 void
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2621 replace_buffer_in_all_windows (buffer)
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2622 Lisp_Object buffer;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2623 {
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2624 Lisp_Object tail, frame;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2625
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2626 /* 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
2627 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
2628 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
2629 FOR_EACH_FRAME (tail, frame)
20066
affc9c857428 (replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents: 20046
diff changeset
2630 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
2631 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633 /* 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
2634
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2635 /* 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
2636 might crash Emacs. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2637
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2638 #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
2639 #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
2640
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2641 /* 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
2642 the total number of lines of w. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2643
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2644 #define WINDOW_TOTAL_SIZE(w, wp) \
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2645 (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
2646
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2647 /* 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
2648 minimum allowable size. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2649
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2650 void
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2651 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
2652 FRAME_PTR frame;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2653 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
2654 {
4347
d6b289b1a6dc * window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents: 4292
diff changeset
2655 /* 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
2656 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
2657 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
2658 int min_height
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2659 = ((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
2660 ? MIN_SAFE_WINDOW_HEIGHT
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2661 : 2 * MIN_SAFE_WINDOW_HEIGHT);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2662
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2663 if (FRAME_TOP_MARGIN (frame) > 0)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2664 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
2665
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2666 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
2667 *rows = min_height;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2668 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
2669 *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
2670 }
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2671
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2672 /* 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
2673 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
2674 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
2675 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
2676 either. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2677
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2678 static int
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2679 window_fixed_size_p (w, width_p, check_siblings_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2680 struct window *w;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2681 int width_p, check_siblings_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2682 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2683 int fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2684 struct window *c;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2685
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2686 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2687 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2688 c = XWINDOW (w->hchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2689
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2690 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2691 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2692 /* 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
2693 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2694 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2695 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2696 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2697 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2698 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2699 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2700 /* 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
2701 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2702 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2703 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2704 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2705 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2706 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2707 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2708 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2709 c = XWINDOW (w->vchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2710
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2711 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2712 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2713 /* 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
2714 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2715 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2716 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2717 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2718 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2719 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2720 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2721 /* 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
2722 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2723 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2724 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2725 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2726 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2727 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2728 else if (BUFFERP (w->buffer))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2729 {
65602
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2730 struct buffer *old = current_buffer;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2731 Lisp_Object val;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2732
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2733 current_buffer = XBUFFER (w->buffer);
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2734 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
2735 current_buffer = old;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2736
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2737 fixed_p = 0;
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2738 if (!EQ (val, Qunbound))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2739 {
65602
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2740 fixed_p = !NILP (val);
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2741
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2742 if (fixed_p
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2743 && ((EQ (val, Qheight) && width_p)
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2744 || (EQ (val, Qwidth) && !width_p)))
25b770eb7993 (make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents: 65004
diff changeset
2745 fixed_p = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2746 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2747
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2748 /* 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
2749 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
2750 if (!fixed_p && check_siblings_p && WINDOWP (w->parent))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2751 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2752 Lisp_Object child;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2753
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
2754 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
2755 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2756 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2757
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2758 if (NILP (child))
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
2759 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
2760 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2761 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2762
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2763 if (NILP (child))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2764 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2765 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2766 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2767 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2768 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2769
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2770 return fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2771 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2772
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2773 /* 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
2774 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
2775 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
2776 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
2777 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
2778 minibuffer window, always return 1. */
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2779
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2780 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2781 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
2782 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2783 int width_p, safe_p;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2784 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2785 /* 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
2786 window_min_width here. */
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2787 if (width_p)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2788 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2789 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
2790 + WINDOW_FRINGE_COLS (w)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2791 + WINDOW_SCROLL_BAR_COLS (w));
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2792
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2793 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
2794 }
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2795 else if (MINI_WINDOW_P (w))
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2796 return 1;
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
2797 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2798 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2799 int safe_size = (MIN_SAFE_WINDOW_HEIGHT
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2800 + ((BUFFERP (w->buffer)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2801 && !NILP (XBUFFER (w->buffer)->mode_line_format))
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2802 ? 1 : 0));
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2803
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2804 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
2805 }
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2806 }
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2807
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2808 /* 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
2809 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
2810 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
2811 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
2812 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
2813 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
2814 sizes of W's children. */
25268
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 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2817 window_min_size_1 (w, width_p, safe_p)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2818 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2819 int width_p, safe_p;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2820 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2821 struct window *c;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2822 int size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2823
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2824 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2825 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2826 /* W is a horizontal combination. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2827 c = XWINDOW (w->hchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2828 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2829
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2830 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2831 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2832 /* 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
2833 the minimum widths of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2834 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2835 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2836 size += window_min_size_1 (c, 1, safe_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2837 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2838 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2839 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2840 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2841 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2842 /* The minimum height of a horizontal combination is the
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2843 maximum of the minimum heights of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2844 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2845 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2846 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
2847 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2848 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2849 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2850 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2851 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2852 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2853 /* W is a vertical combination. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2854 c = XWINDOW (w->vchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2855 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2856
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2857 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2858 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2859 /* 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
2860 of the minimum widths of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2861 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2862 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2863 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
2864 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2865 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2866 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2867 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2868 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2869 /* 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
2870 the minimum height of its children. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2871 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2872 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2873 size += window_min_size_1 (c, 0, safe_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2874 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2875 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2876 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2877 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2878 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2879 /* W is a leaf window. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2880 size = window_min_size_2 (w, width_p, safe_p);
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2881
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2882 return size;
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2883 }
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2884
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2885 /* 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
2886 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
2887 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
2888 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
2889 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
2890 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
2891 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
2892
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2893 static int
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2894 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
2895 struct window *w;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2896 int width_p, safe_p, ignore_fixed_p, *fixed;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2897 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2898 int size, fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2899
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2900 if (ignore_fixed_p)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2901 fixed_p = 0;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2902 else
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2903 fixed_p = window_fixed_size_p (w, width_p, 1);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2904
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2905 if (fixed)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2906 *fixed = fixed_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2907
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2908 if (fixed_p)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2909 size = WINDOW_TOTAL_SIZE (w, width_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2910 else
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2911 size = window_min_size_1 (w, width_p, safe_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2912
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2913 return size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2914 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2915
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2916
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
2917 /* 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
2918 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
2919 is still too narrow. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2920
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2921 static int
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2922 adjust_window_margins (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2923 struct window *w;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2924 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2925 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
2926 - WINDOW_FRINGE_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2927 - WINDOW_SCROLL_BAR_COLS (w));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2928 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
2929 + WINDOW_RIGHT_MARGIN_COLS (w));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2930
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2931 if (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
2932 return 1;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2933
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2934 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
2935 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2936
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2937 /* 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
2938 margins will fix that. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2939 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
2940 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
2941 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2942 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
2943 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
2944 = make_number (margin_cols/2);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2945 else
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2946 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
2947 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2948 else
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2949 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
2950 return 1;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2951 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
2952
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2953 /* 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
2954 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
2955 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
2956 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
2957 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
2958 shrink columns, otherwise shrink lines.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2959
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2960 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
2961 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
2962 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
2963 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
2964 and scrollbars.
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2965
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2966 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
2967 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
2968 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
2969 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
2970
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2971 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
2972 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
2973 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
2974 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
2975 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
2976 static int *
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2977 shrink_windows (total, size, nchildren, shrinkable, resize_fixed_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2978 forward, width_p, safe_p)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2979 int total, size, nchildren, shrinkable;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2980 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
2981 Lisp_Object forward;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2982 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2983 int available_resize = 0;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2984 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
2985 struct window *c;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2986 Lisp_Object child;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2987 int smallest = total;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2988 int total_removed = 0;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2989 int total_shrink = total - size;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2990 int i;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2991
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2992 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
2993 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
2994
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2995 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
2996 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2997 int child_size;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2998
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
2999 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3000 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3001
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3002 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
3003 new_sizes[i] = -1;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3004 else
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 new_sizes[i] = child_size;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3007 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
3008 if (child_size > min_sizes[i]
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3009 && NILP (c->resize_proportionally))
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3010 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
3011 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3012 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3013 /* 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
3014 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
3015
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3016 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
3017 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3018 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
3019 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
3020 smallest = new_sizes[i];
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 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
3023 if (new_sizes[i] == smallest)
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3024 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3025 /* 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
3026 new_sizes[i] = 0;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3027 if (smallest > min_sizes[i])
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3028 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
3029 available_resize += smallest;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3030 --shrinkable;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3031 total_removed += smallest;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3032
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
3033 /* 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
3034 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
3035
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3036 /* 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
3037 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
3038 break;
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 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3041
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3042 /* 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
3043 proportional to its size. */
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3044 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
3045 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3046 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
3047 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3048 int to_shrink = total_shrink * new_sizes[i] / total;
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3049
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3050 if (new_sizes[i] - to_shrink < min_sizes[i])
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3051 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
3052 new_sizes[i] -= to_shrink;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3053 total_removed += to_shrink;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3054 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3055 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3056
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3057 /* 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
3058 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
3059 while (total_shrink > total_removed)
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3060 {
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
3061 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
3062 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
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 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
3065 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
3066 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3067 ++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
3068 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
3069 }
58441
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3070
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3071 for (i = 0; i < nchildren; ++i)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3072 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
3073 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3074 --new_sizes[i];
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3075 ++total_removed;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3076
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3077 /* 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
3078 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
3079 break;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3080 }
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
3081
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3082 /* 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
3083 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
3084 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
3085 }
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3086
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3087 /* 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
3088 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
3089 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3090 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
3091 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3092 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
3093 {
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3094 ++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
3095 --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
3096 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
3097 }
72149deebe89 * window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents: 58175
diff changeset
3098 }
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3099 }
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3100
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3101 xfree (min_sizes);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3102
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3103 return new_sizes;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3104 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3105
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3106 /* 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
3107 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
3108 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
3109
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3110 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
3111 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
3112 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
3113
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3114 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
3115 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
3116 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
3117 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
3118 This should give better behavior when resizing frames. */
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 static void
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3121 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
3122 Lisp_Object window;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3123 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
3124 int first_only, last_only;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3125 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3126 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3127 struct window *c;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3128 Lisp_Object child, *forward, *sideward;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3129 int old_size = WINDOW_TOTAL_SIZE (w, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3130
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3131 size = max (0, size);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3132
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3133 /* Delete WINDOW if it's too small. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3134 if (nodelete_p != 1 && !NILP (w->parent)
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3135 && 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
3136 {
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3137 delete_window (window);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3138 return;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3139 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3140
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3141 /* Set redisplay hints. */
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3142 w->last_modified = make_number (0);
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3143 w->last_overlay_modified = make_number (0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3144 windows_or_buffers_changed++;
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
3145 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3146
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3147 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3148 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3149 sideward = &w->vchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3150 forward = &w->hchild;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3151 w->total_cols = make_number (size);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3152 adjust_window_margins (w);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3153 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3154 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3155 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3156 sideward = &w->hchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3157 forward = &w->vchild;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3158 w->total_lines = make_number (size);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3159 w->orig_total_lines = Qnil;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3160 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3161
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3162 if (!NILP (*sideward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3163 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3164 /* 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
3165 for (child = *sideward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3166 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3167 c = XWINDOW (child);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3168 if (width_p)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3169 c->left_col = w->left_col;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3170 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3171 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
3172 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
3173 first_only, last_only);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3174 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3175 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3176 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
3177 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3178 /* 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
3179 Lisp_Object last_child;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3180 int child_size;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3181
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3182 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
3183 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3184 c = XWINDOW (child);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3185 last_child = child;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3186 }
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3187
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3188 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3189 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
3190 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
3191 }
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3192 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
3193 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3194 /* 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
3195 int child_size;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3196
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3197 child = *forward;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3198 c = XWINDOW (child);
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3199
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3200 if (width_p)
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3201 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
3202 else
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3203 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
3204
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3205 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3206 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
3207 width_p, nodelete_p, first_only, last_only);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3208 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3209 else if (!NILP (*forward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3210 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3211 int fixed_size, each, extra, n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3212 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
3213 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
3214 int *new_sizes = NULL;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3215
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3216 /* 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
3217 number of child windows. */
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3218 fixed_size = nchildren = nfixed = total = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3219 for (child = *forward; !NILP (child); child = c->next, ++nchildren)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3220 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3221 int child_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3222
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3223 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3224 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
3225 total += child_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3226
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3227 if (window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3228 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
3229 fixed_size += child_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3230 ++nfixed;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3231 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3232 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3233
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3234 /* 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
3235 aren't any resizable windows, allow resizing fixed-size
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3236 windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3237 resize_fixed_p = nfixed == nchildren || size < fixed_size;
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 /* 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
3240 value of extra takes care of rounding errors. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3241 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
3242 if (size < total && n > 1)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3243 new_sizes = shrink_windows (total, size, nchildren, n,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3244 resize_fixed_p, *forward, width_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3245 nodelete_p == 2);
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3246 else
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3247 {
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3248 each = (size - total) / n;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3249 extra = (size - total) - n * each;
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3250 }
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 /* 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
3253 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
3254 last_pos = first_pos;
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3255 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
3256 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3257 int new_size, old_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3258
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3259 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3260 old_size = WINDOW_TOTAL_SIZE (c, width_p);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3261 new_size = old_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3262
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3263 /* 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
3264 bottom or right edge of its predecessor. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3265 if (width_p)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3266 c->left_col = make_number (last_pos);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3267 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3268 c->top_line = make_number (last_pos);
25268
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 /* If this child can be resized, do it. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3271 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
3272 {
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3273 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
3274 extra = 0;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3275 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3276
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3277 /* Set new size. Note that size_window also propagates
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3278 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
3279 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
3280 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
3281
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3282 /* Remember the bottom/right edge position of this child; it
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3283 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
3284 last_pos += new_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3285 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3286
95481
4390d64d3328 Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents: 94963
diff changeset
3287 xfree (new_sizes);
52821
20085e7ea081 * window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52617
diff changeset
3288
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3289 /* We should have covered the parent exactly with child windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3290 xassert (size == last_pos - first_pos);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3291
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3292 /* Now delete any children that became too small. */
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3293 if (nodelete_p != 1)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3294 for (child = *forward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3295 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3296 int child_size;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3297
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3298 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3299 child_size = WINDOW_TOTAL_SIZE (c, width_p);
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3300 size_window (child, child_size, width_p, nodelete_p,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3301 first_only, last_only);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3302 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3303 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3304 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3305
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3306 /* 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
3307 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
3308 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
3309 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
3310 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
3311 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
3312 displayed correctly. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3313
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3314 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3315 set_window_height (window, height, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3316 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3317 int height;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3318 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3319 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3320 size_window (window, height, 0, nodelete, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3321 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3322
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3323 /* 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
3324 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
3325 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
3326 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
3327 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
3328 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
3329 displayed correctly. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3330
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3331 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3332 set_window_width (window, width, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3333 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3334 int width;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3335 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3336 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
3337 size_window (window, width, 1, nodelete, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3338 }
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3339
50367
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3340 /* 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
3341
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3342 void
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3343 change_window_heights (window, n)
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3344 Lisp_Object window;
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3345 int n;
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3346 {
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3347 struct window *w = XWINDOW (window);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3348
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3349 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
3350 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
3351
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3352 if (INTEGERP (w->orig_top_line))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3353 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
3354 if (INTEGERP (w->orig_total_lines))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3355 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
3356
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3357 /* 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
3358 if (!NILP (w->vchild))
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3359 change_window_heights (w->vchild, n);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3360
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3361 /* 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
3362 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
3363 {
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3364 w = XWINDOW (window);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3365 change_window_heights (window, n);
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3366 }
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3367 }
169f9122da43 Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents: 50233
diff changeset
3368
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3369
362
d1e5cf833d37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 358
diff changeset
3370 int window_select_count;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3371
51240
1fe905dd5836 (Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51223
diff changeset
3372 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
3373 EXFUN (Fset_window_scroll_bars, 4);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3374
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3375 static void
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3376 run_funs (Lisp_Object funs)
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3377 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3378 for (; CONSP (funs); funs = XCDR (funs))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3379 if (!EQ (XCAR (funs), Qt))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3380 call0 (XCAR (funs));
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3381 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3382
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3383 static Lisp_Object select_window_norecord (Lisp_Object window);
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3384 static Lisp_Object select_frame_norecord (Lisp_Object frame);
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3385
88050
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3386 void
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3387 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
3388 {
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3389 int count = SPECPDL_INDEX ();
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3390 Lisp_Object frame, global_wcch
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3391 = Fdefault_value (Qwindow_configuration_change_hook);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3392 XSETFRAME (frame, f);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3393
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3394 if (NILP (Vrun_hooks))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3395 return;
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3396
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3397 if (SELECTED_FRAME () != f)
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3398 {
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3399 record_unwind_protect (select_frame_norecord, Fselected_frame ());
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3400 Fselect_frame (frame, Qt);
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3401 }
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3402
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3403 /* 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
3404 if (current_buffer != XBUFFER (Fwindow_buffer (Qnil)))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3405 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3406 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3407 Fset_buffer (Fwindow_buffer (Qnil));
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3408 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3409
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3410 /* Look for buffer-local values. */
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3411 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3412 Lisp_Object windows = Fwindow_list (frame, Qlambda, Qnil);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3413 for (; CONSP (windows); windows = XCDR (windows))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3414 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3415 Lisp_Object window = XCAR (windows);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3416 Lisp_Object buffer = Fwindow_buffer (window);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3417 if (!NILP (Flocal_variable_p (Qwindow_configuration_change_hook,
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3418 buffer)))
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3419 {
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3420 int count = SPECPDL_INDEX ();
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3421 record_unwind_protect (select_window_norecord, Fselected_window ());
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3422 select_window_norecord (window);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3423 run_funs (Fbuffer_local_value (Qwindow_configuration_change_hook,
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3424 buffer));
99120
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3425 unbind_to (count, Qnil);
43309e005911 (Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents: 99034
diff changeset
3426 }
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3427 }
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3428 }
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3429
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3430 run_funs (global_wcch);
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
3431 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
3432 }
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87847
diff changeset
3433
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3434 /* 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
3435 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
3436 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
3437 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
3438 reset from the buffer's local settings. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3439
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3440 void
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3441 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
3442 Lisp_Object window, buffer;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3443 int run_hooks_p, keep_margins_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3444 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3445 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3446 struct buffer *b = XBUFFER (buffer);
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
3447 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
3448 int samebuf = EQ (buffer, w->buffer);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3449
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3450 w->buffer = buffer;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3451
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3452 if (EQ (window, selected_window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3453 b->last_selected_window = window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3454
58441
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3455 /* Let redisplay errors through. */
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3456 b->display_error_modiff = 0;
9b7ff064cb26 (set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents: 58265
diff changeset
3457
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3458 /* Update time stamps of buffer display. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3459 if (INTEGERP (b->display_count))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3460 XSETINT (b->display_count, XINT (b->display_count) + 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3461 b->display_time = Fcurrent_time ();
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3462
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3463 XSETFASTINT (w->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3464 XSETFASTINT (w->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3465 bzero (&w->last_cursor, sizeof w->last_cursor);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3466 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
3467 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
3468 { /* 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
3469 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
3470 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
3471 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
3472 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
3473 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
3474 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
3475 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
3476 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
3477 w->vscroll = 0;
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3478 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
3479 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
3480 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
3481 buffer);
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3482 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
3483 w->force_start = Qnil;
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3484 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
3485 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
3486 }
800f21c9f989 (set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
3487 /* 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
3488 I doubt it's worth the trouble. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3489 windows_or_buffers_changed++;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3490
98154
b67146e746c0 (set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97141
diff changeset
3491 /* 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
3492 /* We can't check ! NILP (Vwindow_scroll_functions) here
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3493 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
3494 if (window_initialized)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3495 {
98154
b67146e746c0 (set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97141
diff changeset
3496 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3497 Fset_buffer (buffer);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3498 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3499
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
3500 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
3501
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3502 if (!keep_margins_p)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3503 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3504 /* 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
3505
51223
c1daf1c22f97 (Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents: 51207
diff changeset
3506 /* 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
3507 temporarily disable window margins. */
52617
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3508 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
3509 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
3510
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3511 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
3512
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3513 Fset_window_fringes (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3514 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
3515 b->fringes_outside_margins);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3516
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3517 Fset_window_scroll_bars (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3518 b->scroll_bar_width,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3519 b->vertical_scroll_bar_type, Qnil);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3520
52617
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3521 w->left_margin_cols = save_left;
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3522 w->right_margin_cols = save_right;
f8adaf14f570 (set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents: 52565
diff changeset
3523
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3524 Fset_window_margins (window,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3525 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
3526 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3527
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3528 if (run_hooks_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3529 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3530 if (! NILP (Vwindow_scroll_functions))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3531 run_hook_with_args_2 (Qwindow_scroll_functions, window,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3532 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
3533 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
3534 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3535
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3536 unbind_to (count, Qnil);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3537 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3538
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3539
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3540 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
3541 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
3542 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
3543 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
3544 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
3545 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
3546 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
3547
99160
966b11d23209 (Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents: 99142
diff changeset
3548 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
3549 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
3550 already display BUFFER-OR-NAME.
57031
0730ef55b4d8 (Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56616
diff changeset
3551
99210
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
3552 This function runs `window-scroll-functions' before running
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
3553 `window-configuration-change-hook'. */)
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3554 (window, buffer_or_name, keep_margins)
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3555 register Lisp_Object window, buffer_or_name, keep_margins;
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3556 {
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3557 register Lisp_Object tem, buffer;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3558 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3559
27848
27b993d2ea05 (Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents: 27699
diff changeset
3560 XSETWINDOW (window, w);
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3561 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
3562 CHECK_BUFFER (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3563 if (NILP (XBUFFER (buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3564 error ("Attempt to display deleted buffer");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3565
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3566 tem = w->buffer;
98884
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3567 if (NILP (tem))
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3568 error ("Window is deleted");
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3569 else if (!EQ (tem, Qt))
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3570 /* w->buffer is t when the window is first being set up. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3571 {
99142
ed258613edc7 (Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99120
diff changeset
3572 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
3573 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
3574 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
3575 else
ed258613edc7 (Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99120
diff changeset
3576 w->dedicated = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3577
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3578 unshow_buffer (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3579 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3580
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3581 set_window_buffer (window, buffer, 1, !NILP (keep_margins));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3582 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3583 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3584
98829
e27ba9bfde7a (Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents: 98792
diff changeset
3585 /* 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
3586 Fset_window_configuration. */
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3587
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3588 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
3589 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
3590 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
3591 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
3592 Optional second arg NORECORD non-nil means do not put this buffer
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3593 at the front of the list of recently selected ones and do not
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3594 make this window the most recently selected one.
98176
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3595
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3596 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
3597 selected window before each command. */)
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3598 (window, norecord)
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3599 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
3600 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3601 register struct window *w;
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3602 register struct window *ow;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3603 struct frame *sf;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3604
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3605 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3606
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3607 w = XWINDOW (window);
39953
3a1666ed16b8 (select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents: 39952
diff changeset
3608 w->frozen_window_start_p = 0;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3609
98176
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3610 if (NILP (norecord))
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3611 {
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3612 ++window_select_count;
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3613 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
3614 }
9f150a0f6e59 (Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents: 98154
diff changeset
3615
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3616 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3617 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3618
84758
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3619 sf = SELECTED_FRAME ();
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3620 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
3621 {
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3622 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
3623 /* 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
3624 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
3625 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
3626 frame is active. */
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3627 Fselect_frame (WINDOW_FRAME (w), norecord);
84758
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3628 /* 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
3629 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
3630 return window;
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3631 }
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3632 else
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3633 sf->selected_window = window;
1ad5dfad0058 (candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84505
diff changeset
3634
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3635 /* Store the current buffer's actual point into the
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3636 old selected window. It belongs to that window,
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
3637 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
3638 if (!NILP (selected_window))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3639 {
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3640 ow = XWINDOW (selected_window);
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3641 if (! NILP (ow->buffer))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3642 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
3643 BUF_PT (XBUFFER (ow->buffer)),
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3644 BUF_PT_BYTE (XBUFFER (ow->buffer)));
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3645 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3646
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3647 selected_window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3648
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3649 if (NILP (norecord))
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3650 record_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3652
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
3653 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
3654
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 /* Go to the point recorded in the window.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3656 This is important when the buffer is in more
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3657 than one window. It also matters when
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3658 redisplay_window has altered point after scrolling,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3659 because it makes the change only in the window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3660 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3661 register int new_point = marker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3662 if (new_point < BEGV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3663 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
3664 else if (new_point > ZV)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3665 SET_PT (ZV);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3666 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3667 SET_PT (new_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3668 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3669
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3670 windows_or_buffers_changed++;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3671 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3672 }
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3673
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3674 static Lisp_Object
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3675 select_window_norecord (window)
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3676 Lisp_Object window;
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3677 {
99277
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
3678 return WINDOW_LIVE_P (window)
d10f49e09034 (Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 99210
diff changeset
3679 ? Fselect_window (window, Qt) : selected_window;
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
3680 }
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3681
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3682 static Lisp_Object
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3683 select_frame_norecord (frame)
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3684 Lisp_Object frame;
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3685 {
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3686 return FRAME_LIVE_P (XFRAME (frame))
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3687 ? Fselect_frame (frame, Qt) : selected_frame;
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
3688 }
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3689
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3690 Lisp_Object
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3691 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
3692 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
3693 {
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3694 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
3695 }
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3696
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3697 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
3698 0, 1, 0,
71717
dfc0eccac6a1 (Fforce_window_update): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 71396
diff changeset
3699 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
3700 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
3701 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
3702 displaying that buffer. */)
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3703 (object)
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3704 Lisp_Object object;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3705 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3706 if (NILP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3707 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3708 windows_or_buffers_changed++;
54178
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3709 update_mode_lines++;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3710 return Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3711 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3712
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3713 if (WINDOWP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3714 {
54178
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3715 struct window *w = XWINDOW (object);
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3716 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
3717 w->update_mode_line = Qt;
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3718 if (BUFFERP (w->buffer))
1ab08664aea0 (window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents: 53927
diff changeset
3719 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
3720 ++update_mode_lines;
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3721 return Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3722 }
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
3723
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3724 if (STRINGP (object))
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3725 object = Fget_buffer (object);
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3726 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
3727 {
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3728 /* 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
3729 of each of those windows. */
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3730
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3731 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
3732 return NILP (object) ? Qnil : Qt;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3733 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3734
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3735 /* 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
3736 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
3737 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
3738 return Qnil;
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3739 }
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3740
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
3741
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3742 void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3743 temp_output_buffer_show (buf)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3744 register Lisp_Object buf;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3745 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3746 register struct buffer *old = current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3747 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3748 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3749
18493
d65021d5c39e (temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 18065
diff changeset
3750 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
3751
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3752 Fset_buffer (buf);
10302
34556316a48a (temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 10043
diff changeset
3753 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3754 BEGV = BEG;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3755 ZV = Z;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756 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
3757 #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
3758 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
3759 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3760 set_buffer_internal (old);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3761
67234
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
3762 if (!NILP (Vtemp_buffer_show_function))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3763 call1 (Vtemp_buffer_show_function, buf);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3764 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3765 {
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
3766 window = display_buffer (buf, Qnil, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3767
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3768 if (!EQ (XWINDOW (window)->frame, selected_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3769 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3770 Vminibuf_scroll_window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3771 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
3772 XSETFASTINT (w->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
3773 XSETFASTINT (w->min_hscroll, 0);
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3774 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
3775 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
3776
22149
ad3ee5ec90d1 (Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 21844
diff changeset
3777 /* 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
3778 and its buffer current. */
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3779
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3780 if (!NILP (Vrun_hooks)
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3781 && !NILP (Fboundp (Qtemp_buffer_show_hook))
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3782 && !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
3783 {
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3784 int count = SPECPDL_INDEX ();
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3785 Lisp_Object prev_window, prev_buffer;
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3786 prev_window = selected_window;
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3787 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
3788
51674
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3789 /* 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
3790 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
3791 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
3792 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
3793 record_unwind_protect (Fset_buffer, prev_buffer);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3794 record_unwind_protect (select_window_norecord, prev_window);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3795 Fselect_window (window, Qt);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3796 Fset_buffer (w->buffer);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3797 call1 (Vrun_hooks, Qtemp_buffer_show_hook);
c78e0c6e92aa (Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51477
diff changeset
3798 unbind_to (count, Qnil);
11405
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3799 }
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3800 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3801 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3802
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
3803 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804 make_dummy_parent (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3805 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3806 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3807 Lisp_Object new;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3808 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
3809 int i;
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3810
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3811 o = XWINDOW (window);
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3812 p = allocate_window ();
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3813 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
3814 ((struct Lisp_Vector *) p)->contents[i]
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3815 = ((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
3816 XSETWINDOW (new, p);
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3817
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
3818 ++sequence_number;
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
3819 XSETFASTINT (p->sequence_number, sequence_number);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3820
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3821 /* Put new into window structure in place of window */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3822 replace_window (window, new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3823
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3824 o->next = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3825 o->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3826 o->vchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827 o->hchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828 o->parent = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3830 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3831 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832 p->buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3834
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3835 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
3836 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
3837 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
3838 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
3839 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
3840 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
3841 Interactively, all arguments are nil.
8eb84bf840a8 (Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56174
diff changeset
3842 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
3843 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
3844 if it was selected before.
c53dfaf68575 (Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 71041
diff changeset
3845
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3846 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
3847 (window, size, horizontal)
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3848 Lisp_Object window, size, horizontal;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3849 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3850 register Lisp_Object new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3851 register struct window *o, *p;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3852 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
3853 register int size_int;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3854
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3855 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3856 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3858 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3860 o = XWINDOW (window);
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3861 fo = XFRAME (WINDOW_FRAME (o));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3862
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3863 if (NILP (size))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3864 {
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3865 if (!NILP (horizontal))
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3866 /* 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
3867 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
3868 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
3869 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
3870 size_int = (XFASTINT (o->total_cols) + 1) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3871 else
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3872 size_int = XFASTINT (o->total_lines) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3873 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3874 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3875 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3876 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
3877 size_int = XINT (size);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3878 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3879
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3880 if (MINI_WINDOW_P (o))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3881 error ("Attempt to split minibuffer window");
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3882 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
3883 error ("Attempt to split fixed-size window");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3884
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3885 if (NILP (horizontal))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3886 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3887 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
3888
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
3889 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
3890 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
3891 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
3892 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
3893 XFASTINT (o->total_lines) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3894 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3895 || NILP (XWINDOW (o->parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3896 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3897 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3898 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3899 XWINDOW (new)->vchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3900 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3901 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3902 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3903 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
3904 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
3905
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
3906 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
3907 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
3908 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
3909 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
3910 XFASTINT (o->total_cols) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3911 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3912 || NILP (XWINDOW (o->parent)->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3913 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3914 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3915 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3916 XWINDOW (new)->hchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3917 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3918 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3919
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3920 /* Now we know that window's parent is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921 if we are dividing vertically, or a horizontal combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3922 if we are making side-by-side windows */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924 windows_or_buffers_changed++;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3925 FRAME_WINDOW_SIZES_CHANGED (fo) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3926 new = make_window ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3927 p = XWINDOW (new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3928
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3929 p->frame = o->frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 p->next = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3931 if (!NILP (p->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3932 XWINDOW (p->next)->prev = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3933 p->prev = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3934 o->next = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3935 p->parent = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3936 p->buffer = Qt;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3937 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3938 bzero (&p->last_cursor, sizeof p->last_cursor);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3939
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3940 /* Duplicate special geometry settings. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3941
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3942 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
3943 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
3944 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
3945 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
3946 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
3947 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
3948 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
3949
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3950 /* Apportion the available frame space among the two new windows */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951
98792
052c176f40f3 (Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents: 98176
diff changeset
3952 if (!NILP (horizontal))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3953 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3954 p->total_lines = o->total_lines;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3955 p->top_line = o->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3956 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
3957 XSETFASTINT (o->total_cols, size_int);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3958 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
3959 adjust_window_margins (p);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3960 adjust_window_margins (o);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3961 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3962 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3963 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3964 p->left_col = o->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3965 p->total_cols = o->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3966 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
3967 XSETFASTINT (o->total_lines, size_int);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3968 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3969 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3970
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3971 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3972 adjust_glyphs (fo);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3973
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
3974 Fset_window_buffer (new, o->buffer, Qt);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3975 return new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3976 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3977
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
3978 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
3979 doc: /* Make selected window SIZE lines taller.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3980 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
3981 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
3982 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
3983 -SIZE lines or columns. Return nil.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3984
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3985 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
3986 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
3987 (size, horizontal)
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3988 Lisp_Object size, horizontal;
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3989 {
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3990 CHECK_NUMBER (size);
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
3991 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
3992
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
3993 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
3994
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3995 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3996 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3997
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
3998 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
3999 doc: /* Make selected window SIZE lines smaller.
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4000 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
4001 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
4002 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
4003 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
4004
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4005 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
4006 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
4007 (size, horizontal)
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4008 Lisp_Object size, horizontal;
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4009 {
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4010 CHECK_NUMBER (size);
52608ae6f162 (Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents: 98829
diff changeset
4011 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
4012
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4013 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
4014
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4015 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4016 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4017
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4018 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4019 window_height (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4020 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4021 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4022 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
4023 return WINDOW_TOTAL_LINES (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4024 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4025
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4026 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4027 window_width (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4028 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4029 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4030 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
4031 return WINDOW_TOTAL_COLS (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4032 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4033
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4034
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4035 #define CURBEG(w) \
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4036 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4037
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4038 #define CURSIZE(w) \
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4039 *(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
4040
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4041
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4042 /* 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
4043 horizontally; zero means do it vertically.
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4044
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4045 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
4046 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
4047 deleted. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4048
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4049 static void
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4050 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
4051 Lisp_Object window;
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4052 int delta, horiz_flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4053 {
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4054 Lisp_Object parent, next, prev;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4055 struct window *p;
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4056 Lisp_Object *sizep;
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4057 int maximum;
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
4058 int (*sizefun) P_ ((Lisp_Object))
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4059 = horiz_flag ? window_width : window_height;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4060 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
4061 = (horiz_flag ? set_window_width : set_window_height);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4062
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4063 /* 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
4064 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
4065 error ("Window is not resizable");
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4066
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4067 /* Find the parent of the selected window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4068 while (1)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4069 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4070 p = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4071 parent = p->parent;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4072
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
4073 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4074 {
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4075 if (horiz_flag)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4076 error ("No other window to side of this one");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4077 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4078 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4079
66664
93a5a20be8f1 (Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents: 66657
diff changeset
4080 if (horiz_flag
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4081 ? !NILP (XWINDOW (parent)->hchild)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
4082 : !NILP (XWINDOW (parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4083 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4084
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4085 window = parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4086 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4087
1049
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
4088 sizep = &CURSIZE (window);
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
4089
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4090 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4091 register int maxdelta;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4092
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4093 /* 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
4094
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4095 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4096 /* 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
4097 : !NILP (p->next) ? ((*sizefun) (p->next)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4098 - window_min_size (XWINDOW (p->next),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4099 horiz_flag, 0, 0, 0))
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4100 /* 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
4101 : !NILP (p->prev) ? ((*sizefun) (p->prev)
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4102 - window_min_size (XWINDOW (p->prev),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4103 horiz_flag, 0, 0, 0))
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4104 /* 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
4105 or a minibufferless frame. */
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4106 : (delta = 0));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4107
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4108 if (delta > maxdelta)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4109 /* This case traps trying to make the minibuffer
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4110 the full frame, or make the only window aside from the
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4111 minibuffer the full frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4112 delta = maxdelta;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4113 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4114
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4115 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window),
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4116 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
4117 {
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
4118 delete_window (window);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
4119 return;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4120 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4121
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4122 if (delta == 0)
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4123 return;
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4124
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4125 /* 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
4126 maximum = 0;
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4127 for (next = p->next; WINDOWP (next); next = XWINDOW (next)->next)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4128 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4129 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
4130 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
4131 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4132 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
4133
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4134 /* 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
4135 if (delta <= maximum)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4136 {
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4137 Lisp_Object first_unaffected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4138 Lisp_Object first_affected;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4139 int fixed_p;
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4140
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4141 next = p->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4142 prev = p->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4143 first_affected = window;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4144 /* 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
4145 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
4146 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
4147 while (delta != 0
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4148 && (!NILP (next) || !NILP (prev)))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4149 {
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4150 if (! NILP (next))
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4151 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4152 int this_one = ((*sizefun) (next)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4153 - window_min_size (XWINDOW (next), horiz_flag,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4154 0, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4155 if (!fixed_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4156 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4157 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4158 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4159
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4160 (*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
4161 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4162
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4163 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4164 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4165
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4166 next = XWINDOW (next)->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4167 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4168
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4169 if (delta == 0)
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4170 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4171
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4172 if (! NILP (prev))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4173 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4174 int this_one = ((*sizefun) (prev)
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4175 - window_min_size (XWINDOW (prev), horiz_flag,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4176 0, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4177 if (!fixed_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4178 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4179 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4180 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4181
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4182 first_affected = prev;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4183
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4184 (*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
4185 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4186
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4187 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4188 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4189
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4190 prev = XWINDOW (prev)->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4191 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4192 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4193
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4194 xassert (delta == 0);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4195
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4196 /* 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
4197 based on the new sizes. */
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4198 first_unaffected = next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4199 prev = first_affected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4200 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
4201 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
4202 {
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4203 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
4204 /* 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
4205 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
4206 (*setsizefun) (next, (*sizefun) (next), 0);
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4207 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4208 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4209 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4210 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4211 register int delta1;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4212 register int opht = (*sizefun) (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4213
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4214 if (opht <= XINT (*sizep) + delta)
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4215 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4216 /* 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
4217 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
4218 Lisp_Object start, tem, next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4219
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4220 start = XWINDOW (parent)->vchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4221 if (NILP (start))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4222 start = XWINDOW (parent)->hchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4223
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4224 /* 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
4225 tem = XWINDOW (window)->next;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4226 while (! NILP (tem))
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4227 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4228 next = XWINDOW (tem)->next;
42862
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4229 delete_window (tem);
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4230 tem = next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4231 }
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4232
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4233 /* 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
4234 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
4235 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
4236 tem = start;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4237 while (! EQ (tem, window))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4238 {
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4239 next = XWINDOW (tem)->next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4240 delete_window (tem);
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4241 tem = next;
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4242 }
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4243 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4244 else
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4245 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4246 /* Otherwise, make delta1 just right so that if we add
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4247 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
4248 shrink the parent back to its original size, the new
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4249 proportional size of this window will increase by delta.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4250
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4251 The function size_window will compute the new height h'
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4252 of the window from delta1 as:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4253
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4254 e = delta1/n
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4255 x = delta1 - delta1/n * n for the 1st resizable child
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4256 h' = h + e + x
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4257
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4258 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
4259 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
4260 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
4261
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4262 h' = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4263
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4264 So, delta1 must be
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4265
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4266 h + e = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4267 delta1/n = delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4268 delta1 = n * delta.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4269
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
4270 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
4271 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
4272 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
4273
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4274 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
4275 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
4276 use resize_proportionally to work around this problem. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4277
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4278 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4279 Lisp_Object s;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4280 int n = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4281
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4282 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
4283 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
4284 ++n;
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4285 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
4286 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
4287 ++n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4288
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4289 delta1 = n * delta;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4290
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4291 /* 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
4292 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
4293 XSETINT (CURSIZE (parent), opht + delta1);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4294 (*setsizefun) (window, XINT (*sizep) + delta1, 0);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4295
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4296 /* 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
4297 shrinking this window and siblings proportionately. This
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4298 brings parent back to correct size. Delta1 was calculated
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4299 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
4300 out of the siblings.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4301
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4302 Temporarily set resize_proportionally to Qt to assure that,
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4303 if necessary, shrink_windows deletes smaller windows rather
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4304 than shrink this window. */
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4305 w->resize_proportionally = Qt;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4306 (*setsizefun) (parent, opht, 0);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4307 w->resize_proportionally = Qnil;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4308 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4309 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4310
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
4311 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
4312 XSETFASTINT (p->last_overlay_modified, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4313
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4314 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4315 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4316 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4317
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4318
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4319 /* 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
4320 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
4321 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
4322
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4323 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
4324 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
4325 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
4326
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4327 static void
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4328 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
4329 Lisp_Object window;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4330 int delta, horiz_flag;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4331 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4332 Lisp_Object parent, child;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4333 struct window *p;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4334 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
4335 int delcount = window_deletion_count;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4336
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4337 CHECK_WINDOW (window);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4338
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4339 /* 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
4340 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
4341 error ("Window is not resizable");
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4342
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4343 while (1)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4344 {
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4345 Lisp_Object first_parallel = Qnil;
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4346
71339
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4347 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
4348 {
71396
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4349 /* 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
4350 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
4351 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
4352 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
4353 }
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4354
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4355 p = XWINDOW (window);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4356 parent = p->parent;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4357
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4358 /* 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
4359 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
4360 if (horiz_flag)
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4361 {
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4362 if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild))
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4363 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
4364 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
4365 {
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4366 /* 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
4367 which has no parent. */
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4368 first_parallel = window;
58383949ec48 (size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 71339
diff changeset
4369 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
4370 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
4371 }
70081
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4372 }
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4373 else
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4374 {
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4375 if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild))
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4376 first_parallel = XWINDOW (parent)->hchild;
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4377 }
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4378
71339
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4379 /* 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
4380 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
4381 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
4382 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
4383 && 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
4384 {
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4385 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
4386 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
4387 }
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4388
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4389 /* Don't make this window too small. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4390 if (XINT (CURSIZE (window)) + delta
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4391 < 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
4392 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4393 Fset_window_configuration (old_config);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4394 error ("Cannot adjust window size as specified");
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
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4397 /* Clear out some redisplay caches. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4398 XSETFASTINT (p->last_modified, 0);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4399 XSETFASTINT (p->last_overlay_modified, 0);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4400
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4401 /* Adjust this window's edge. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4402 XSETINT (CURSIZE (window),
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4403 XINT (CURSIZE (window)) + delta);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4404
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4405 /* 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
4406 make them smaller, and exit the loop.
7130f5a10a22 (adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents: 70058
diff changeset
4407
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4408 (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
4409 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
4410 if (NILP (first_parallel))
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4411 {
71339
0c8a94363573 (adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents: 71286
diff changeset
4412 if (!NILP (p->next))
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4413 {
68724
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4414 /* 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
4415 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
4416 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
4417 {
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4418 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
4419 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
4420 }
fb5a31085a6f * window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
4421
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4422 XSETINT (CURBEG (p->next),
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4423 XINT (CURBEG (p->next)) + delta);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4424 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
4425 horiz_flag, 0, 1, 0);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4426 break;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4427 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4428 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4429 else
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4430 /* 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
4431 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
4432 for (child = first_parallel;
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4433 ! NILP (child);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4434 child = XWINDOW (child)->next)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4435 if (! EQ (child, window))
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4436 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
4437 horiz_flag, 0, 0, 1);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4438
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4439 window = parent;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4440 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4441
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4442 /* 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
4443 we failed. Report failure. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4444 if (delcount != window_deletion_count)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4445 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4446 Fset_window_configuration (old_config);
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4447 error ("Cannot adjust window size as specified");
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4448 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4449
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4450 /* Adjust glyph matrices. */
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4451 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4452 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4453
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4454 #undef CURBEG
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4455 #undef CURSIZE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4456
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4457 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
4458 Sadjust_window_trailing_edge, 3, 3, 0,
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4459 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
4460 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
4461 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
4462
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4463 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
4464 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
4465 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
4466 (window, delta, horizontal)
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4467 Lisp_Object window, delta, horizontal;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4468 {
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4469 CHECK_NUMBER (delta);
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4470 if (NILP (window))
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4471 window = selected_window;
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4472 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
4473
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4474 run_window_configuration_change_hook
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4475 (XFRAME (WINDOW_FRAME (XWINDOW (window))));
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4476
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4477 return Qnil;
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4478 }
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
4479
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4480
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4481
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 Resizing Mini-Windows
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4484 ***********************************************************************/
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 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
4487
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4488 enum save_restore_action
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4489 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4490 CHECK_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4491 SAVE_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4492 RESTORE_ORIG_SIZES
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4493 };
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4494
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4495 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
4496 enum save_restore_action));
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4497
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4498 /* 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
4499 from lowest windows first. */
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 static void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4502 shrink_window_lowest_first (w, height)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4503 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4504 int height;
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 struct window *c;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4507 Lisp_Object child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4508 int old_height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4509
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4510 xassert (!MINI_WINDOW_P (w));
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 /* Set redisplay hints. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4513 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4514 XSETFASTINT (w->last_overlay_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4515 windows_or_buffers_changed++;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4516 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
4517
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4518 old_height = XFASTINT (w->total_lines);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4519 XSETFASTINT (w->total_lines, height);
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4520
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4521 if (!NILP (w->hchild))
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 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
4524 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4525 c = XWINDOW (child);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4526 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
4527 shrink_window_lowest_first (c, height);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4528 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4529 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4530 else if (!NILP (w->vchild))
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4531 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4532 Lisp_Object last_child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4533 int delta = old_height - height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4534 int last_top;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4535
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4536 last_child = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4537
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4538 /* 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
4539 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
4540 backwards. */
85330
0bc184c59770 * xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85260
diff changeset
4541 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
4542 last_child = child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4543
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4544 /* 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
4545 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
4546 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4547 int this_one;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4548
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4549 c = XWINDOW (child);
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4550 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
4551
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4552 if (this_one > delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4553 this_one = delta;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4554
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4555 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
4556 delta -= this_one;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4557 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4558
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4559 /* Compute new positions. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4560 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
4561 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
4562 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4563 c = XWINDOW (child);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4564 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
4565 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
4566 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
4567 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4568 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4569 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4570
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4571
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4572 /* 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
4573 rooted at W. ACTION says what to do.
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4574
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4575 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
4576 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
4577 tree. Value is non-zero if they are valid.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4578
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4579 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
4580 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
4581
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4582 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
4583 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
4584
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4585 static int
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4586 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
4587 struct window *w;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4588 enum save_restore_action action;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4589 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4590 int success_p = 1;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4591
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4592 while (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4593 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4594 if (!NILP (w->hchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4595 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4596 if (!save_restore_orig_size (XWINDOW (w->hchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4597 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4598 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4599 else if (!NILP (w->vchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4600 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4601 if (!save_restore_orig_size (XWINDOW (w->vchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4602 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4603 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4604
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4605 switch (action)
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4606 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4607 case CHECK_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4608 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
4609 return 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4610 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4611
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4612 case SAVE_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4613 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
4614 w->orig_total_lines = w->total_lines;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4615 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4616 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4617 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4618
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4619 case RESTORE_ORIG_SIZES:
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4620 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
4621 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
4622 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
4623 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
4624 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4625 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4626 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4627
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4628 default:
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4629 abort ();
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4630 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4631
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4632 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
4633 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4634
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4635 return success_p;
25792
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
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4639 /* 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
4640 without deleting other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4641
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4642 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4643 grow_mini_window (w, delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4644 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4645 int delta;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4646 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4647 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4648 struct window *root;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4649
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4650 xassert (MINI_WINDOW_P (w));
105769
a71b9df39f6e * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
Juanma Barranquero <lekktu@gmail.com>
parents: 105728
diff changeset
4651 /* Commenting out the following assertion goes against the stated interface
a71b9df39f6e * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
Juanma Barranquero <lekktu@gmail.com>
parents: 105728
diff changeset
4652 of the function, but it currently does not seem to do anything useful.
a71b9df39f6e * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
Juanma Barranquero <lekktu@gmail.com>
parents: 105728
diff changeset
4653 See discussion of this issue in the thread for bug#4534.
a71b9df39f6e * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
Juanma Barranquero <lekktu@gmail.com>
parents: 105728
diff changeset
4654 xassert (delta >= 0); */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4655
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4656 /* 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
4657 other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4658 root = XWINDOW (FRAME_ROOT_WINDOW (f));
105769
a71b9df39f6e * window.c (grow_mini_window): Comment out "delta >= 0" assertion.
Juanma Barranquero <lekktu@gmail.com>
parents: 105728
diff changeset
4659 if (delta > 0)
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4660 {
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
4661 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
4662 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
4663 /* 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
4664 min_height. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4665 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
4666 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4667
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4668 if (delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4669 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4670 /* 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
4671 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4672 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
4673
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4674 /* Shrink other windows. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4675 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
4676
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4677 /* Grow the mini-window. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4678 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
4679 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
4680 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4681 XSETFASTINT (w->last_overlay_modified, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4682
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4683 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4684 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4685 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4686
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4687
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4688 /* 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
4689 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
4690 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
4691 line. */
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4692
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4693 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4694 shrink_mini_window (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4695 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4696 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4697 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4698 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
4699
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4700 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
4701 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4702 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
4703 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4704 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4705 windows_or_buffers_changed = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4706 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4707 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
4708 {
35621
5f154b8fc2bd (size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents: 35483
diff changeset
4709 /* 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
4710 among the other windows. */
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4711 Lisp_Object window;
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4712 XSETWINDOW (window, w);
67328
97a5b7b69235 (enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents: 67234
diff changeset
4713 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
4714 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4715 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4716
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4717
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4718
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4719 /* 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
4720 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
4721 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
4722 the frame are cleared. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4723
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4724 void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4725 mark_window_cursors_off (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4726 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4727 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4728 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4729 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4730 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4731 mark_window_cursors_off (XWINDOW (w->hchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4732 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4733 mark_window_cursors_off (XWINDOW (w->vchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4734 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4735 w->phys_cursor_on_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4736
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4737 w = NILP (w->next) ? 0 : XWINDOW (w->next);
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 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4740
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4741
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4742 /* Return number of lines of text (not counting mode lines) in W. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4743
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4744 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4745 window_internal_height (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4746 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4747 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4748 int ht = XFASTINT (w->total_lines);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4749
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4750 if (!MINI_WINDOW_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4751 {
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4752 if (!NILP (w->parent)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4753 || !NILP (w->vchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4754 || !NILP (w->hchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4755 || !NILP (w->next)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4756 || !NILP (w->prev)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4757 || WINDOW_WANTS_MODELINE_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4758 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4759
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4760 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
4761 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4762 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4763
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4764 return ht;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4765 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4766
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4767
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4768 /* 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
4769 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
4770 separating W from the sibling to its right. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4771
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4772 int
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4773 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
4774 struct window *w;
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4775 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4776 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
4777 int width = XINT (w->total_cols);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4778
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4779 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4780 /* 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
4781 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
4782 else if (!FRAME_WINDOW_P (f)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4783 && !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
4784 /* The column of `|' characters separating side-by-side windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4785 occupies one column only. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4786 width -= 1;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4787
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4788 if (FRAME_WINDOW_P (f))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4789 /* 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
4790 used for normal text. */
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4791 width -= (WINDOW_FRINGE_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4792 + WINDOW_LEFT_MARGIN_COLS (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
4793 + 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
4794
701db778b7a4 (Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents: 16208
diff changeset
4795 return width;
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4796 }
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4797
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4798
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 Window Scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4801 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4802
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4803 /* 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
4804 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
4805 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
4806 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
4807 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
4808 respectively. */
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4809
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4810 static void
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4811 window_scroll (window, n, whole, noerror)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4812 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4813 int n;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4814 int whole;
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
4815 int noerror;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4816 {
47865
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4817 immediate_quit = 1;
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4818
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4819 /* 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
4820 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
4821 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame)))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4822 window_scroll_pixel_based (window, n, whole, noerror);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4823 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4824 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
4825
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4826 immediate_quit = 0;
24997
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
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4829
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4830 /* 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
4831 heights. See the comment of window_scroll for parameter
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4832 descriptions. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4833
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4834 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4835 window_scroll_pixel_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4836 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4837 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4838 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4839 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4840 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4841 struct it it;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4842 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4843 struct text_pos start;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4844 int this_scroll_margin;
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
4845 /* 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
4846 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
4847 int x, y, rtop, rbot, rowh, vpos;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4848
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4849 SET_TEXT_POS_FROM_MARKER (start, w->start);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4850
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4851 /* 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
4852 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
4853 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
4854 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
4855
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4856 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
4857 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4858 /* 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
4859 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
4860 results for variable height lines. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4861 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
4862 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
4863 move_it_vertically_backward (&it, window_box_height (w) / 2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4864
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4865 /* 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
4866 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
4867 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
4868 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
4869 start of the line containing PT in this case. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4870 if (it.current_y <= 0)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4871 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4872 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
4873 move_it_vertically_backward (&it, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4874 it.current_y = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4875 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4876
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4877 start = it.current.pos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4878 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4879 else if (auto_window_vscroll_p)
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4880 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4881 if (rtop || rbot) /* partially visible */
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4882 {
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4883 int px;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4884 int dy = WINDOW_FRAME_LINE_HEIGHT (w);
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4885 if (whole)
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4886 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
4887 - 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
4888 dy);
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4889 dy *= n;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4890
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4891 if (n < 0)
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4892 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4893 /* 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
4894 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
4895 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4896 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
4897 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
4898 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4899 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4900 }
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4901 if (n > 0)
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4902 {
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4903 /* 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
4904 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
4905 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4906 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
4907 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
4908 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4909 }
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4910
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4911 /* 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
4912 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
4913 {
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4914 int spos;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4915
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4916 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
4917 /* 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
4918 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
4919 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
4920 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
4921 else
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4922 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
4923 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
4924 w->buffer);
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4925 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
4926 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
4927 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
4928 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
4929 /* 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
4930 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
4931 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
4932 return;
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4933 }
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4934 }
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4935 }
72663
6e654c485c0a (Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents: 72615
diff changeset
4936 /* Cancel previous vscroll. */
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
4937 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
4938 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4939
58083
49b5dabf0ccc Fix commentary.
Kim F. Storm <storm@cua.dk>
parents: 57898
diff changeset
4940 /* 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
4941 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
4942 if (!NILP (Vscroll_preserve_screen_position))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4943 {
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4944 /* We preserve the goal pixel coordinate across consecutive
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
4945 calls to scroll-up, scroll-down and other commands that
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
4946 have the `scroll-command' property. This avoids the
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4947 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
4948 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
4949 if (window_scroll_pixel_based_preserve_y < 0
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
4950 || !SYMBOLP (current_kboard->Vlast_command)
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
4951 || NILP (Fget (current_kboard->Vlast_command, Qscroll_command)))
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4952 {
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4953 start_display (&it, w, start);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
4954 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
4955 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
4956 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
4957 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4958 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4959 else
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
4960 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
4961 = window_scroll_pixel_based_preserve_x = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4962
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4963 /* 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
4964 backward. The result is the new window start. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4965 start_display (&it, w, start);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4966 if (whole)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4967 {
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4968 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
4969 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
4970 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
4971 - 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
4972 dy) * n;
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4973
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4974 /* 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
4975 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
4976 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
4977 if (dy <= 0)
59717
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4978 {
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4979 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
4980 /* 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
4981 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
4982 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
4983 && start_pos > BEGV)
351ffb20ab9f (window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents: 59700
diff changeset
4984 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
4985 }
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4986 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
4987 {
75b50deae4e9 (window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents: 59677
diff changeset
4988 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
4989 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
4990 /* 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
4991 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
4992 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
4993 && start_pos < ZV)
75b50deae4e9 (window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents: 59677
diff changeset
4994 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
4995 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4996 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4997 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4998 move_it_by_lines (&it, n, 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4999
49011
594a08370cb3 (window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents: 48945
diff changeset
5000 /* 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
5001 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
5002 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
5003 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
5004 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start)))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5005 {
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5006 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
5007 {
48945
a96801f68a82 (window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents: 48927
diff changeset
5008 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
5009 && (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
5010 > it.last_visible_y))
35126
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
5011 {
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
5012 /* 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
5013 visible. */
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
5014 w->vscroll = (it.last_visible_y
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
5015 - 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
5016 adjust_glyphs (it.f);
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
5017 }
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5018 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5019 return;
71286
1d2d52a04520 (window_scroll_pixel_based): Signal "Beginning of buffer" when scroll-down
Eli Zaretskii <eliz@gnu.org>
parents: 71146
diff changeset
5020 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
5021 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
5022 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5023 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
5024 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5025 else
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5026 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5027 if (w->vscroll != 0)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5028 /* 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
5029 visible. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5030 w->vscroll = 0;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5031 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5032 return;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5033 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5034 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
5035 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5036
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5037 /* 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
5038
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5039 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
5040
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5041 /* 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
5042 vscrolled = 1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5043 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5044
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5045 if (! vscrolled)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5046 {
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5047 int pos = IT_CHARPOS (it);
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5048 int bytepos;
49836
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5049
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5050 /* 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
5051 the next character. */
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5052 if (in_display_vector_p (&it))
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5053 {
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5054 ++pos;
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5055 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
5056 }
33592610b3e0 (window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents: 49600
diff changeset
5057
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5058 /* 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
5059 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
5060 w->buffer);
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5061 bytepos = XMARKER (w->start)->bytepos;
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
5062 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
5063 ? Qt : Qnil);
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5064 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
5065 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
5066 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
5067 /* 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
5068 window-scroll-functions. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5069 w->force_start = Qt;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5070 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5071
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5072 /* 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
5073 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
5074 it.current_y = it.vpos = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5075
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5076 /* Move PT out of scroll margins.
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5077 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
5078 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
5079 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
5080 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
5081 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
5082
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5083 if (n > 0)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5084 {
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5085 /* 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
5086 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
5087 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
5088 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
5089 && (NILP (Vscroll_preserve_screen_position)
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5090 || 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
5091 /* 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
5092 ;
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5093 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
5094 {
59342
132e8f3a36a1 (window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents: 59258
diff changeset
5095 /* 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
5096 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
5097 move_it_to (&it, -1,
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5098 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
5099 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
5100 - (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
5101 -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
5102 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
5103 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5104 else
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5105 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5106 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
5107 {
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
5108 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
5109 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
5110 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
5111 break;
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
5112 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5113 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5114 }
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5115 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5116 else if (n < 0)
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5117 {
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5118 int charpos, bytepos;
60198
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5119 int partial_p;
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5120
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5121 /* 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
5122 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
5123 charpos = IT_CHARPOS (it);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5124 bytepos = IT_BYTEPOS (it);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5125
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5126 /* 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
5127 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
5128 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
5129 (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
5130 - 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
5131 -1,
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5132 MOVE_TO_POS | MOVE_TO_Y);
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5133
60198
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5134 /* 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
5135 charpos = IT_CHARPOS (it);
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5136 bytepos = IT_BYTEPOS (it);
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5137
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5138 /* 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
5139 if (it.what == IT_EOB)
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5140 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
5141 else
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5142 {
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5143 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
5144 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
5145 }
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5146
63865
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5147 if (charpos == PT && !partial_p
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5148 && (NILP (Vscroll_preserve_screen_position)
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5149 || 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
5150 /* 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
5151 ;
69408
aa89c5390b12 Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69342
diff changeset
5152 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
5153 {
59258
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5154 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
5155 start_display (&it, w, start);
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
5156 /* 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
5157 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
5158 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
5159 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
5160 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
5161 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
5162 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
5163 }
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5164 else
e5b68c4be92b (window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents: 58732
diff changeset
5165 {
60198
d75e10df3675 (window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents: 59717
diff changeset
5166 if (partial_p)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5167 /* 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
5168 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
5169 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5170 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
5171 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
5172 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5173 else
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
5174 /* 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
5175 SET_PT_BOTH (charpos, bytepos);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5176 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5177 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5178 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5179
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5180
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5181 /* 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
5182 See the comment of window_scroll for parameter descriptions. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5183
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5184 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5185 window_scroll_line_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5186 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5187 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5188 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5189 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5190 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5191 register struct window *w = XWINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5192 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
5193 register int pos, pos_byte;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5194 register int ht = window_internal_height (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5195 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5196 int lose;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5197 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
5198 int startpos;
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5199 Lisp_Object original_pos = Qnil;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5200
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5201 /* 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
5202 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
5203 if (whole)
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5204 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
5205
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5206 startpos = marker_position (w->start);
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5207
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5208 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
5209 {
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5210 if (window_scroll_preserve_vpos <= 0
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
5211 || !SYMBOLP (current_kboard->Vlast_command)
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
5212 || NILP (Fget (current_kboard->Vlast_command, Qscroll_command)))
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5213 {
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5214 struct position posit
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5215 = *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
5216 PT, ht, 0,
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5217 -1, XINT (w->hscroll),
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5218 0, w);
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5219 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
5220 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
5221 }
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5222
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
5223 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
5224 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
5225 }
13102
960db92441d8 (window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents: 12981
diff changeset
5226
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
5227 XSETFASTINT (tem, PT);
32773
a7fdbf39d4de (window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents: 32752
diff changeset
5228 tem = Fpos_visible_in_window_p (tem, window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5229
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5230 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5231 {
6341
dfc758dd2b08 (window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents: 6326
diff changeset
5232 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
5233 startpos = PT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5234 }
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
5235
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
5236 SET_PT (startpos);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5237 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
5238 Fvertical_motion (make_number (n), window);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5239 pos = PT;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5240 pos_byte = PT_BYTE;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5241 bolp = Fbolp ();
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5242 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5243
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5244 if (lose)
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5245 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5246 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5247 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5248 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5249 xsignal0 (Qbeginning_of_buffer);
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5250 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5251
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5252 if (pos < ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5253 {
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5254 int this_scroll_margin = scroll_margin;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5255
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5256 /* 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
5257 if (this_scroll_margin < 0)
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5258 this_scroll_margin = 0;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5259
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5260 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
5261 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
5262
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5263 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5264 w->start_at_line_beg = bolp;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5265 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
5266 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
5267 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
5268 /* 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
5269 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
5270 w->force_start = Qt;
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5271
63865
a473419e315e (window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents: 63611
diff changeset
5272 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
5273 && (whole || !EQ (Vscroll_preserve_screen_position, Qt)))
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5274 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5275 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
5276 Fvertical_motion (original_pos, window);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5277 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5278 /* 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
5279 that it is outside the scroll margin. */
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5280 else if (n > 0)
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5281 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5282 int top_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5283
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5284 if (this_scroll_margin > 0)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5285 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5286 SET_PT_BOTH (pos, pos_byte);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5287 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
5288 top_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5289 }
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5290 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5291 top_margin = pos;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5292
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5293 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
5294 SET_PT_BOTH (opoint, opoint_byte);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5295 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
5296 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5297 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
5298 Fvertical_motion (original_pos, window);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5299 }
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5300 else
20046
8baac8399a29 (window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents: 19667
diff changeset
5301 SET_PT (top_margin);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5302 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5303 else if (n < 0)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5304 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5305 int bottom_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5306
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5307 /* 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
5308 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
5309 SET_PT_BOTH (pos, pos_byte);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5310 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
5311 if (XFASTINT (tem) == ht - this_scroll_margin)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5312 bottom_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5313 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5314 bottom_margin = PT + 1;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5315
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5316 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
5317 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5318 else
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5319 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5320 if (!NILP (Vscroll_preserve_screen_position))
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5321 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5322 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
5323 Fvertical_motion (original_pos, window);
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5324 }
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5325 else
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5326 Fvertical_motion (make_number (-1), window);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5327 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5328 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5329 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5330 else
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5331 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5332 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5333 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5334 else
71991
2cbe7a01a491 (window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents: 71844
diff changeset
5335 xsignal0 (Qend_of_buffer);
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5336 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5337 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5338
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5339
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5340 /* 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
5341 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
5342 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
5343 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
5344 up. This is the guts of Fscroll_up and Fscroll_down. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5345
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5346 static void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5347 scroll_command (n, direction)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5348 Lisp_Object n;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5349 int direction;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5350 {
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5351 int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5352
85260
96a92ff6e0de Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85022
diff changeset
5353 xassert (eabs (direction) == 1);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5354
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5355 /* 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
5356 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
5357 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5358 {
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5359 record_unwind_protect (save_excursion_restore, save_excursion_save ());
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5360 Fset_buffer (XWINDOW (selected_window)->buffer);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5361
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5362 /* Make redisplay consider other windows than just selected_window. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5363 ++windows_or_buffers_changed;
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5364 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5365
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5366 if (NILP (n))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5367 window_scroll (selected_window, direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368 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
5369 window_scroll (selected_window, -direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5370 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5371 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5372 n = Fprefix_numeric_value (n);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5373 window_scroll (selected_window, XINT (n) * direction, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5374 }
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5375
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5376 unbind_to (count, 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
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5379 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
5380 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
5381 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
5382 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
5383 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
5384 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
5385 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
5386 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5387 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5388 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5389 scroll_command (arg, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5390 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5391 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5392
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5393 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
5394 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
5395 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
5396 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
5397 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
5398 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
5399 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
5400 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5401 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5402 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5403 scroll_command (arg, -1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5404 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5405 }
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5406
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5407 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
5408 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
5409 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
5410 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
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. 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 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5415 {
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5416 Lisp_Object window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5417
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5418 if (MINI_WINDOW_P (XWINDOW (selected_window))
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5419 && !NILP (Vminibuf_scroll_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5420 window = Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5421 /* If buffer is specified, scroll that buffer. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5422 else if (!NILP (Vother_window_scroll_buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5423 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5424 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5425 if (NILP (window))
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
5426 window = display_buffer (Vother_window_scroll_buffer, Qt, Qnil);
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 else
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5429 {
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5430 /* 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
5431 frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5432 window = Fnext_window (selected_window, Qnil, Qnil);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5433
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5434 if (EQ (window, selected_window))
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5435 /* 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
5436 visible frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5437 do
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5438 window = Fnext_window (window, Qnil, Qt);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5439 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
5440 && ! EQ (window, selected_window));
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5441 }
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5442
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5443 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5444
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5445 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5446 error ("There is no other window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5447
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5448 return window;
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5449 }
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5450
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5451 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
5452 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
5453 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
5454 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
5455 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
5456 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
5457 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
5458
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
5459 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
5460 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
5461 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
5462 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
5463 `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
5464 (arg)
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5465 Lisp_Object arg;
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5466 {
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5467 Lisp_Object window;
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5468 struct window *w;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5469 int count = SPECPDL_INDEX ();
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5470
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5471 window = Fother_window_for_scrolling ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5472 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5473
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5474 /* Don't screw up if window_scroll gets an error. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5475 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
5476 ++windows_or_buffers_changed;
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 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5479 SET_PT (marker_position (w->pointm));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5480
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5481 if (NILP (arg))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5482 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
5483 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
5484 window_scroll (window, -1, 1, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5485 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5486 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5487 if (CONSP (arg))
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5488 arg = Fcar (arg);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5489 CHECK_NUMBER (arg);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5490 window_scroll (window, XINT (arg), 0, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5491 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5492
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5493 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
5494 unbind_to (count, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5495
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5496 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5497 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5498
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5499 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
5500 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
5501 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5502 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
5503 effect after the change.
99189
dc2662d377a4 * window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents: 99160
diff changeset
5504 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
5505 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
5506 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
5507 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
5508 (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
5509 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5510 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5511 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5512 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5513 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5514
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5515 if (NILP (arg))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5516 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5517 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5518 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5519
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5520 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
5521 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
5522
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5523 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
5524 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
5525
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5526 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5527 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5528
93547
7a747c3c0def (Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents: 93436
diff changeset
5529 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
5530 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
5531 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5532 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
5533 effect after the change.
99189
dc2662d377a4 * window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents: 99160
diff changeset
5534 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
5535 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
5536 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
5537 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
5538 (arg, set_minimum)
57898
f85e0cc87926 (Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 57874
diff changeset
5539 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5540 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5541 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5542 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5543 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5544
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5545 if (NILP (arg))
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5546 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5547 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5548 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5549
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5550 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
5551 result = Fset_window_hscroll (selected_window, make_number (hscroll));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5552
57874
b3e916ae83ea (window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents: 57508
diff changeset
5553 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
5554 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
5555
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5556 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5557 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5558
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5559 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
5560 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
5561 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
5562 ()
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5563 {
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5564 if (minibuf_level > 0
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5565 && MINI_WINDOW_P (XWINDOW (selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5566 && WINDOW_LIVE_P (minibuf_selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5567 return minibuf_selected_window;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5568
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5569 return Qnil;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5570 }
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5571
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5572 /* 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
5573 as opposed to its height. */
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5574
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5575 static int
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5576 displayed_window_lines (w)
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5577 struct window *w;
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 struct it it;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5580 struct text_pos start;
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5581 int height = window_box_height (w);
33059
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5582 struct buffer *old_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5583 int bottom_y;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5584
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5585 if (XBUFFER (w->buffer) != current_buffer)
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5586 {
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5587 old_buffer = current_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5588 set_buffer_internal (XBUFFER (w->buffer));
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5589 }
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5590 else
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5591 old_buffer = NULL;
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5592
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5593 /* 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
5594 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
5595 calls (recenter -1) while W->start is 1. */
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5596 if (XMARKER (w->start)->charpos < BEGV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5597 SET_TEXT_POS (start, BEGV, BEGV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5598 else if (XMARKER (w->start)->charpos > ZV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5599 SET_TEXT_POS (start, ZV, ZV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5600 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5601 SET_TEXT_POS_FROM_MARKER (start, w->start);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5602
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5603 start_display (&it, w, start);
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5604 move_it_vertically (&it, height);
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5605 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
5606
47234
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5607 /* 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
5608 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
5609 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
5610 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
5611 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
5612 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
5613 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
5614 height++;
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5615
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5616 /* 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
5617 if (bottom_y < height)
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5618 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5619 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
5620 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
5621 }
34384
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5622
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5623 if (old_buffer)
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5624 set_buffer_internal (old_buffer);
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5625
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5626 return it.vpos;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5627 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5628
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5629
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5630 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P",
103557
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5631 doc: /* Center point in selected window and maybe redisplay frame.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5632 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
5633 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
5634 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
5635
103557
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5636 If ARG is omitted or nil, then recenter with point on the middle line of
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5637 the selected window; if the variable `recenter-redisplay' is non-nil,
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5638 also erase the entire frame and redraw it (when `auto-resize-tool-bars'
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5639 is set to `grow-only', this resets the tool-bar's height to the minimum
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5640 height needed); if `recenter-redisplay' has the special value `tty',
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5641 then only tty frame are redrawn.
74966
749691edf645 (Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents: 74255
diff changeset
5642
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5643 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
5644 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
5645 (arg)
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5646 register Lisp_Object arg;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5647 {
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5648 struct window *w = XWINDOW (selected_window);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5649 struct buffer *buf = XBUFFER (w->buffer);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5650 struct buffer *obuf = current_buffer;
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5651 int center_p = 0;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5652 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
5653 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
5654 int this_scroll_margin;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5655
42089
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5656 /* 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
5657 obuf->display_error_modiff = 0;
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5658
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5659 if (NILP (arg))
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5660 {
103557
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5661 if (!NILP (Vrecenter_redisplay)
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5662 && (!EQ (Vrecenter_redisplay, Qtty)
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5663 || !NILP (Ftty_type (selected_frame))))
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5664 {
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5665 int i;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5666
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5667 /* Invalidate pixel data calculated for all compositions. */
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5668 for (i = 0; i < n_compositions; i++)
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5669 composition_table[i]->font = NULL;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5670
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5671 WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5672
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5673 Fredraw_frame (WINDOW_FRAME (w));
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5674 SET_FRAME_GARBAGED (WINDOW_XFRAME (w));
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5675 }
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
5676
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5677 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5678 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5679 else if (CONSP (arg)) /* Just C-u. */
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5680 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5681 else
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5682 {
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5683 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
5684 CHECK_NUMBER (arg);
64133
7e06f331c228 (Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents: 64114
diff changeset
5685 iarg = XINT (arg);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5686 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5687
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5688 set_buffer_internal (buf);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5689
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
5690 /* 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
5691 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
5692 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
5693 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
5694 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
5695
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5696 /* 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
5697 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
5698 line counts would lead to strange effects. */
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5699 if (FRAME_WINDOW_P (XFRAME (w->frame)))
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5700 {
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5701 if (center_p)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5702 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5703 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5704 struct text_pos pt;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5705
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5706 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5707 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5708 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
5709 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5710 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5711 }
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
5712 else if (iarg < 0)
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5713 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5714 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5715 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
5716 int nlines = -iarg;
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5717 int extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5718 int h = window_box_height (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5719
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
5720 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
5721
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5722 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5723 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5724
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5725 /* 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
5726 move_it_by_lines (&it, 0, 1);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5727
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5728 /* 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
5729 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
5730 and the lines below. */
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5731 it.current_y = 0;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5732 it.vpos = 0;
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5733 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
5734
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5735 if (it.vpos == nlines)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5736 h -= it.current_y;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5737 else
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5738 {
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5739 /* Last line has no newline */
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5740 h -= line_bottom_y (&it);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5741 it.vpos++;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5742 }
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5743
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5744 /* 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
5745 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
5746
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5747 /* 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
5748 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
5749 if (it.vpos < nlines)
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5750 {
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5751 nlines -= it.vpos;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5752 extra_line_spacing = it.extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5753 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
5754 }
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5755 if (h <= 0)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5756 return Qnil;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5757
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5758 /* 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
5759 start_display (&it, w, pt);
58175
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5760 it.current_y = 0;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5761 move_it_vertically_backward (&it, h);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5762
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5763 /* 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
5764 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
5765 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
5766 in the middle), so move forward.
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5767 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
5768 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
5769 */
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5770 h += extra_line_spacing;
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5771 while (-it.current_y > h)
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5772 move_it_by_lines (&it, 1, 1);
eeb5474ef89f (window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents: 58083
diff changeset
5773
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5774 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5775 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5776 }
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5777 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5778 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5779 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
5780
51f6009d047b (Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
5781 iarg = max (iarg, this_scroll_margin);
51f6009d047b (Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
5782
51f6009d047b (Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
5783 pos = *vmotion (PT, -iarg, w);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5784 charpos = pos.bufpos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5785 bytepos = pos.bytepos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5786 }
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5787 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5788 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5789 {
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5790 struct position pos;
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5791 int ht = window_internal_height (w);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5792
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5793 if (center_p)
64236
667d6d6c7fd9 (Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64134
diff changeset
5794 iarg = ht / 2;
64134
0fcb7f3236c9 (Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents: 64133
diff changeset
5795 else if (iarg < 0)
0fcb7f3236c9 (Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents: 64133
diff changeset
5796 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
5797
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
5798 /* 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
5799 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
5800 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
5801
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
5802 pos = *vmotion (PT, - iarg, w);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5803 charpos = pos.bufpos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5804 bytepos = pos.bytepos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5805 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5806
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5807 /* Set the new window start. */
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5808 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
5809 w->window_end_valid = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5810
46108
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5811 w->optional_new_start = Qt;
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5812
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5813 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
5814 w->start_at_line_beg = Qt;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5815 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5816 w->start_at_line_beg = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5817
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5818 set_buffer_internal (obuf);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5819 return Qnil;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5820 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5821
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5822
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5823 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
5824 0, 1, 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5825 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
5826 WINDOW defaults to the selected window.
99210
ce3730476c2a (Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents: 99189
diff changeset
5827
100770
2cf5314ee101 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100632
diff changeset
5828 The return value does not include the mode line, any header line, nor
2cf5314ee101 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100632
diff changeset
5829 any partial-height lines in the text display area. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5830 (window)
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5831 Lisp_Object window;
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5832 {
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5833 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
5834 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
5835 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
5836 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
5837 }
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5838
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5839
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5840
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5841 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
5842 1, 1, "P",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5843 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
5844 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
5845 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
5846 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
5847 (arg)
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5848 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5849 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5850 struct window *w = XWINDOW (selected_window);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5851 int lines, start;
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5852 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
5853 #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
5854 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
5855 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5856
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5857 window = selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5858 start = marker_position (w->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5859 if (start < BEGV || start > ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5860 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5861 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
5862 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
5863 set_marker_both (w->start, w->buffer, PT, PT_BYTE);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5864 w->start_at_line_beg = Fbolp ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5865 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5866 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5867 else
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5868 Fgoto_char (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5869
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5870 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
5871
51f6009d047b (Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
5872 #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
5873 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
5874 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
5875 #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
5876
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5877 if (NILP (arg))
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5878 XSETFASTINT (arg, lines / 2);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5879 else
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5880 {
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
5881 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
5882
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
5883 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
5884 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
5885
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
5886 #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
5887 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
5888 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
5889 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
5890 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
5891
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
5892 /* 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
5893 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
5894 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
5895 #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
5896
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
5897 arg = make_number (iarg);
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5898 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5899
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5900 /* 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
5901 if (w->vscroll)
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5902 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
5903
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5904 return Fvertical_motion (arg, window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5905 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5906
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5907
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5908
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5909 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5910 Window Configuration
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5911 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5912
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5913 struct save_window_data
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5914 {
85022
96eb42c9e0e3 * window.h (struct window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85013
diff changeset
5915 EMACS_UINT size;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5916 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
5917 Lisp_Object selected_frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5918 Lisp_Object current_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5919 Lisp_Object current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5920 Lisp_Object minibuf_scroll_window;
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
5921 Lisp_Object minibuf_selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5922 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
5923 Lisp_Object focus_frame;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5924 /* 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
5925 for one window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5926 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
5927
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
5928 /* 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
5929 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
5930
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
5931 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
5932 int frame_tool_bar_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5933 };
1326
709532b86646 * window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents: 1325
diff changeset
5934
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5935 /* This is saved as a Lisp_Vector */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5936 struct saved_window
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5937 {
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5938 /* 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
5939 EMACS_UINT size;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5940 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
5941
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5942 Lisp_Object window;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5943 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
5944 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
5945 Lisp_Object hscroll, min_hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5946 Lisp_Object parent, prev;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5947 Lisp_Object start_at_line_beg;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5948 Lisp_Object display_table;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
5949 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
5950 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
5951 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
5952 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
5953 Lisp_Object dedicated, resize_proportionally;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5954 };
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5955
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5956 #define SAVED_WINDOW_N(swv,n) \
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5957 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)])))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5958
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5959 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
5960 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
5961 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5962 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5963 {
71041
8aeb086972ae (struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70736
diff changeset
5964 return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5965 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5966
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5967 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
5968 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
5969 (config)
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5970 Lisp_Object config;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5971 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5972 register struct save_window_data *data;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5973 struct Lisp_Vector *saved_windows;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5974
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
5975 CHECK_WINDOW_CONFIGURATION (config);
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5976
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5977 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
5978 saved_windows = XVECTOR (data->saved_windows);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5979 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
5980 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5981
2297
bb88d48c290f (Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents: 2210
diff changeset
5982 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
5983 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
5984 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
5985 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
5986 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
5987 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
5988 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
5989 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
5990 (configuration)
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
5991 Lisp_Object configuration;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5992 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5993 register struct save_window_data *data;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5994 struct Lisp_Vector *saved_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5995 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
5996 Lisp_Object frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
5997 FRAME_PTR f;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
5998 int old_point = -1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5999
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
6000 CHECK_WINDOW_CONFIGURATION (configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6001
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
6002 data = (struct save_window_data *) XVECTOR (configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6003 saved_windows = XVECTOR (data->saved_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6004
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6005 new_current_buffer = data->current_buffer;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6006 if (NILP (XBUFFER (new_current_buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6007 new_current_buffer = Qnil;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
6008 else
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
6009 {
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
6010 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
6011 /* 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
6012 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
6013 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
6014 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
6015 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
6016 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
6017 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
6018 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
6019 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
6020 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
6021 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
6022 && WINDOWP (selected_window)
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
6023 && 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
6024 && !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
6025 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
6026 else
f1564d57f6a1 (Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67156
diff changeset
6027 old_point = PT;
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
6028 else
61511
db63a29e7669 (Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61444
diff changeset
6029 /* 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
6030 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
6031 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
6032 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
6033 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
6034 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
6035 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
6036 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
6037 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
6038 /* 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
6039 && !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
6040 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
6041 else
db63a29e7669 (Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61444
diff changeset
6042 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
6043 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6044
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6045 frame = 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
6046 f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6047
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6048 /* 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
6049 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
6050 if (FRAME_LIVE_P (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6051 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6052 register struct window *w;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6053 register struct saved_window *p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6054 struct window *root_window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6055 struct window **leaf_windows;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6056 int n_leaf_windows;
33277
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6057 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
6058
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6059 /* 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
6060 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
6061 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
6062 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
6063 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
6064 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
6065 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
6066 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
6067
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6068 /* The mouse highlighting code could get screwed up
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6069 if it runs during this. */
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6070 BLOCK_INPUT;
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6071
86162
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
6072 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
6073 || 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
6074 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
6075 data->frame_cols, 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
6076 #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
6077 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
6078 != 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
6079 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
6080 make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6081 #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
6082 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
6083 != 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
6084 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
6085 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
6086 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6087 #endif
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6088
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6089 /* "Swap out" point from the selected window's buffer
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6090 into the window itself. (Normally the pointm of the selected
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6091 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
6092 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
6093 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
6094 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
6095 {
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
6096 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
6097 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
6098 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
6099 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
6100 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
6101 }
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
6102
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6103 windows_or_buffers_changed++;
10666
e1dfb47b664e (Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents: 10461
diff changeset
6104 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
6105
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6106 /* Problem: Freeing all matrices and later allocating them again
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6107 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
6108 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
6109 below. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6110 root_window = XWINDOW (FRAME_ROOT_WINDOW (f));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6111 leaf_windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6112 = (struct window **) alloca (count_windows (root_window)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6113 * sizeof (struct window *));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6114 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
6115
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6116 /* Kludge Alert!
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6117 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
6118 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
6119
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6120 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
6121 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
6122 dead. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6123 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
6124
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6125 for (k = 0; k < saved_windows->size; k++)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6126 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6127 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
6128 w = XWINDOW (p->window);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6129 w->next = Qnil;
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 (p->parent))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6132 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
6133 XFASTINT (p->parent))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6134 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6135 w->parent = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6136
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6137 if (!NILP (p->prev))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6138 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6139 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
6140 XFASTINT (p->prev))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6141 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
6142 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6143 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6144 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6145 w->prev = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6146 if (!NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6147 {
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6148 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
6149 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6150 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
6151 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
6152 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6153 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6154 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6155 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
6156 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
6157 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6158 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6159 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6160
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6161 /* 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
6162 restore it now. */
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6163 if (BUFFERP (w->total_lines))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6164 w->buffer = w->total_lines;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6165 w->left_col = p->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6166 w->top_line = p->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6167 w->total_cols = p->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6168 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
6169 w->hscroll = p->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6170 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
6171 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
6172 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
6173 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
6174 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
6175 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
6176 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
6177 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
6178 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
6179 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
6180 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
6181 w->dedicated = p->dedicated;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
6182 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
6183 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
6184 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
6185
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6186 /* 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
6187 if (NILP (p->buffer))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6188 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6189 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6190 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6191 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
6192 /* 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
6193 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6194 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6195 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
6196 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
6197 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
6198 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
6199 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
6200
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6201 /* 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
6202 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
6203 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
6204 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
6205 && 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
6206 Fgoto_char (w->pointm);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6207 }
3535
581c09f72dbd (Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents: 3354
diff changeset
6208 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
6209 /* 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
6210 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6211 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
6212 /* 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
6213 range. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6214 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
6215 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
6216 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6217 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6218 else
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6219 /* 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
6220 are real. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6221 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6222 /* 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
6223 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
6224 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
6225 w->buffer);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6226 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
6227 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
6228 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
6229 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
6230 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6231 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6232 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6233 }
1237
3929b2135e58 * window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents: 1123
diff changeset
6234
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6235 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
6236 /* 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
6237 using the buffer that has been restored into it.
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6238 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
6239 selected_window = Qnil;
61444
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6240
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6241 /* Arrange *not* to restore point in the buffer that was
8e54037fa085 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 60198
diff changeset
6242 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
6243 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
6244 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
6245 make_number (old_point),
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6246 XWINDOW (data->current_window)->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6247
51049
12bbef36ecf1 (Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50367
diff changeset
6248 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
6249 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
6250 = selected_window;
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6251
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6252 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
6253 || (FRAMEP (data->focus_frame)
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6254 && FRAME_LIVE_P (XFRAME (data->focus_frame))))
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6255 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
6256
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6257 #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
6258 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
6259 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
6260 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
6261 0, 0, Qnil);
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6262 #endif
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6263
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6264 /* 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
6265 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
6266 || previous_frame_cols != FRAME_COLS (f))
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6267 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
6268 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
6269 #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
6270 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
6271 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
6272 make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6273 #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
6274 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
6275 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
6276 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
6277 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6278 #endif
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6279
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6280 /* 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
6281 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
6282 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6283 if (NILP (leaf_windows[i]->buffer))
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6284 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6285 /* Assert it's not reused as a combination. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6286 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
6287 && NILP (leaf_windows[i]->vchild));
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6288 free_window_matrices (leaf_windows[i]);
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6289 }
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6290 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
6291 ++n;
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6292 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6293
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6294 adjust_glyphs (f);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6295
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6296 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
6297
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6298 /* 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
6299 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
6300 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
6301 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
6302 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
6303 if (FRAME_LIVE_P (XFRAME (data->selected_frame)))
99322
e03a3537f4a2 (select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 99277
diff changeset
6304 do_switch_frame (data->selected_frame, 0, 0, Qnil);
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6305
92192
30086ed69e69 (Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
6306 run_window_configuration_change_hook (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6307 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6308
1325
f03e559aac3e * window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents: 1280
diff changeset
6309 if (!NILP (new_current_buffer))
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6310 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
6311
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6312 Vminibuf_scroll_window = data->minibuf_scroll_window;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
6313 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
6314
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6315 return (FRAME_LIVE_P (f) ? Qt : Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6316 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6317
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6318 /* Mark all windows now on frame as deleted
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6319 by setting their buffers to nil. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6320
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6321 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6322 delete_all_subwindows (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6323 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6324 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6325 if (!NILP (w->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6326 delete_all_subwindows (XWINDOW (w->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6327 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6328 delete_all_subwindows (XWINDOW (w->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6329 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6330 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
6331
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6332 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
6333
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6334 if (!NILP (w->buffer))
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6335 unshow_buffer (w);
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6336
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6337 /* 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
6338 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
6339 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
6340 vchild or hchild set. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6341 w->buffer = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6342 w->vchild = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6343 w->hchild = Qnil;
30045
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6344
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6345 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6346 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6347
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6348 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6349 count_windows (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6350 register struct window *window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6351 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6352 register int count = 1;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6353 if (!NILP (window->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6354 count += count_windows (XWINDOW (window->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6355 if (!NILP (window->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6356 count += count_windows (XWINDOW (window->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6357 if (!NILP (window->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6358 count += count_windows (XWINDOW (window->hchild));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6359 return count;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6360 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6361
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6362
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6363 /* 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
6364 Value is last index + 1. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6365
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6366 static int
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6367 get_leaf_windows (w, flat, i)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6368 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6369 struct window **flat;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6370 int i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6371 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6372 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6373 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6374 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6375 i = get_leaf_windows (XWINDOW (w->hchild), flat, i);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6376 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6377 i = get_leaf_windows (XWINDOW (w->vchild), flat, i);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6378 else
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6379 flat[i++] = w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6380
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6381 w = NILP (w->next) ? 0 : XWINDOW (w->next);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6382 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6383
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6384 return i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6385 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6386
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6387
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6388 /* 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
6389 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
6390 can be returned. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6391
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6392 struct glyph *
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6393 get_phys_cursor_glyph (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6394 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6395 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6396 struct glyph_row *row;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6397 struct glyph *glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6398
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6399 if (w->phys_cursor.vpos >= 0
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6400 && w->phys_cursor.vpos < w->current_matrix->nrows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6401 && (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
6402 row->enabled_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6403 && row->used[TEXT_AREA] > w->phys_cursor.hpos)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6404 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6405 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6406 glyph = NULL;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6407
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6408 return glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6409 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6410
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6411
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6412 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6413 save_window_save (window, vector, i)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6414 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6415 struct Lisp_Vector *vector;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6416 int i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6417 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6418 register struct saved_window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6419 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6420 register Lisp_Object tem;
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 for (;!NILP (window); window = w->next)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6423 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6424 p = SAVED_WINDOW_N (vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6425 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6426
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58217
diff changeset
6427 XSETFASTINT (w->temslot, i); i++;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6428 p->window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6429 p->buffer = w->buffer;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6430 p->left_col = w->left_col;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6431 p->top_line = w->top_line;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6432 p->total_cols = w->total_cols;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6433 p->total_lines = w->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6434 p->hscroll = w->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6435 p->min_hscroll = w->min_hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6436 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
6437 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
6438 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
6439 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
6440 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
6441 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
6442 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
6443 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
6444 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
6445 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
6446 p->dedicated = w->dedicated;
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
6447 p->resize_proportionally = w->resize_proportionally;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6448 if (!NILP (w->buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6449 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6450 /* Save w's value of point in the window configuration.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6451 If w is the selected window, then get the value of point
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6452 from the buffer; pointm is garbage in the selected window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6453 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6454 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6455 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
6456 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
6457 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
6458 BUF_PT_BYTE (XBUFFER (w->buffer)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6459 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6460 else
12981
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6461 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
6462
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6463 p->start = Fcopy_marker (w->start, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6464 p->start_at_line_beg = w->start_at_line_beg;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6465
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6466 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
6467 p->mark = Fcopy_marker (tem, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6468 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6469 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6470 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6471 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6472 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6473 p->mark = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6474 p->start_at_line_beg = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6475 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6476
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6477 if (NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6478 p->parent = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6479 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6480 p->parent = XWINDOW (w->parent)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6481
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6482 if (NILP (w->prev))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6483 p->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6484 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6485 p->prev = XWINDOW (w->prev)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6486
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6487 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6488 i = save_window_save (w->vchild, vector, i);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6489 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6490 i = save_window_save (w->hchild, vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6491 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6492
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6493 return i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6494 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6495
16485
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16392
diff changeset
6496 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
6497 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
6498 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
6499 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
6500 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
6501 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
6502 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
6503 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
6504 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
6505 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
6506 (frame)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6507 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6508 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6509 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6510 register int n_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6511 register struct save_window_data *data;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6512 register int i;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6513 FRAME_PTR f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6514
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6515 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6516 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6517 CHECK_LIVE_FRAME (frame);
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6518 f = XFRAME (frame);
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6519
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6520 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
6521 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
6522 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
6523
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
6524 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
6525 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
6526 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
6527 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
6528 data->selected_frame = selected_frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6529 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
6530 XSETBUFFER (data->current_buffer, current_buffer);
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6531 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
6532 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
6533 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
6534 data->focus_frame = FRAME_FOCUS_FRAME (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6535 tem = Fmake_vector (make_number (n_windows), Qnil);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6536 data->saved_windows = tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6537 for (i = 0; i < n_windows; i++)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6538 XVECTOR (tem)->contents[i]
65004
bc5cf5fc0f9e (SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
6539 = 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
6540 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
6541 XSETWINDOW_CONFIGURATION (tem, data);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6542 return (tem);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6543 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6544
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6545 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
6546 0, UNEVALLED, 0,
56487
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
6547 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
6548 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
6549 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
6550 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
6551 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
6552 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
6553 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
6554 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
6555 (args)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6556 Lisp_Object args;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6557 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6558 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
6559 register int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6560
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6561 record_unwind_protect (Fset_window_configuration,
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6562 Fcurrent_window_configuration (Qnil));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6563 val = Fprogn (args);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6564 return unbind_to (count, val);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6565 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6566
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6567
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6568
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6569 /***********************************************************************
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6570 Window Split Tree
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6571 ***********************************************************************/
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 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
6574 window_tree (w)
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6575 struct window *w;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6576 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6577 Lisp_Object tail = Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6578 Lisp_Object result = Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6579
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6580 while (w)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6581 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6582 Lisp_Object wn;
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 XSETWINDOW (wn, w);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6585 if (!NILP (w->hchild))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6586 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
6587 window_tree (XWINDOW (w->hchild))));
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6588 else if (!NILP (w->vchild))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6589 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
6590 window_tree (XWINDOW (w->vchild))));
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6591
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6592 if (NILP (result))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6593 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6594 result = tail = Fcons (wn, Qnil);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6595 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6596 else
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6597 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6598 XSETCDR (tail, Fcons (wn, Qnil));
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6599 tail = XCDR (tail);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6600 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6601
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6602 w = NILP (w->next) ? 0 : XWINDOW (w->next);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6603 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6604
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6605 return result;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6606 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6607
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6608
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6609
65908
454a4a463081 (window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents: 65826
diff changeset
6610 DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
65826
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6611 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
6612 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
6613
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6614 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
6615 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
6616 is the frame's minibuffer window.
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6617
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6618 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
6619 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
6620 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
6621 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
6622 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
6623 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
6624 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
6625
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6626 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
6627 selected frame. */)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6628 (frame)
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6629 Lisp_Object frame;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6630 {
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6631 FRAME_PTR f;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6632
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6633 if (NILP (frame))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6634 frame = selected_frame;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6635
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6636 CHECK_FRAME (frame);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6637 f = XFRAME (frame);
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6638
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6639 if (!FRAME_LIVE_P (f))
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6640 return Qnil;
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6641
65908
454a4a463081 (window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents: 65826
diff changeset
6642 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
6643 }
d16139114c9c (window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents: 65602
diff changeset
6644
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6645
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6646 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6647 Marginal Areas
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6648 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6649
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6650 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
6651 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
6652 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
6653 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
6654 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
6655 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
6656 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
6657 means no margin. */)
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6658 (window, left_width, right_width)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6659 Lisp_Object window, left_width, right_width;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6660 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6661 struct window *w = decode_window (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6662
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6663 /* Translate negative or zero widths to nil.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6664 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
6665
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6666 if (!NILP (left_width))
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6667 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6668 CHECK_NUMBER (left_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6669 if (XINT (left_width) <= 0)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6670 left_width = Qnil;
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6671 }
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6672
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6673 if (!NILP (right_width))
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6674 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6675 CHECK_NUMBER (right_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6676 if (XINT (right_width) <= 0)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6677 right_width = Qnil;
52852
ac400ff02a1c (Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents: 52836
diff changeset
6678 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6679
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6680 if (!EQ (w->left_margin_cols, left_width)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6681 || !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
6682 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6683 w->left_margin_cols = left_width;
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6684 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
6685
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6686 adjust_window_margins (w);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6687
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6688 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6689 adjust_glyphs (XFRAME (WINDOW_FRAME (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
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6692 return Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6693 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6694
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6695
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6696 DEFUN ("window-margins", Fwindow_margins, Swindow_margins,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6697 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
6698 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
6699 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
6700 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
6701 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
6702 as nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
6703 (window)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6704 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6705 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6706 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
6707 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
6708 }
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
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6711
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6712 /***********************************************************************
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6713 Fringes
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6714 ***********************************************************************/
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6715
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6716 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
6717 2, 4, 0,
52853
91a9da753e30 (Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents: 52852
diff changeset
6718 doc: /* Set the fringe widths of window WINDOW.
91a9da753e30 (Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents: 52852
diff changeset
6719 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
6720 window.
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
6721 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
6722 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
6723 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
6724 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
6725 the command `set-fringe-style'.
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
6726 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
6727 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
6728 display marginal areas and the text area. */)
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6729 (window, left_width, right_width, outside_margins)
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6730 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
6731 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6732 struct window *w = decode_window (window);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6733
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6734 if (!NILP (left_width))
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6735 CHECK_NATNUM (left_width);
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6736 if (!NILP (right_width))
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6737 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
6738
72438
d08eb7bd3ca2 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 72437
diff changeset
6739 /* 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
6740 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
6741 && (!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
6742 || !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
6743 || !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
6744 {
64577
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6745 w->left_fringe_width = left_width;
cc42e18c8870 (Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents: 64236
diff changeset
6746 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
6747 w->fringes_outside_margins = outside_margins;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6748
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6749 adjust_window_margins (w);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6750
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6751 clear_glyph_matrix (w->current_matrix);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6752 w->window_end_valid = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6753
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6754 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6755 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
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
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6758 return Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6759 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6760
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6761
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6762 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
6763 0, 1, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6764 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
6765 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
6766 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
6767 (window)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6768 Lisp_Object window;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6769 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6770 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
6771
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6772 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
6773 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
6774 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
6775 ? Qt : Qnil), Qnil)));
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6776 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6777
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6778
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6779
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6780 /***********************************************************************
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6781 Scroll bars
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
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6784 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
6785 2, 4, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6786 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
6787 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
6788 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
6789 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
6790 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
6791 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
6792 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
6793 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
6794 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
6795 (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
6796 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
6797 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6798 struct window *w = decode_window (window);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6799
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6800 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
6801 {
f3a76c43ac80 (Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58441
diff changeset
6802 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
6803
f3a76c43ac80 (Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58441
diff changeset
6804 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
6805 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
6806 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6807
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
6808 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
6809 || 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
6810 || EQ (vertical_type, Qright)
26d1a4665f6c (Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents: 52560
diff changeset
6811 || EQ (vertical_type, Qt)))
26d1a4665f6c (Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents: 52560
diff changeset
6812 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
6813
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6814 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
6815 || !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
6816 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6817 w->scroll_bar_width = width;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6818 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
6819
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6820 adjust_window_margins (w);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6821
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6822 clear_glyph_matrix (w->current_matrix);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6823 w->window_end_valid = Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6824
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6825 ++windows_or_buffers_changed;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6826 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6827 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6828
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6829 return Qnil;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6830 }
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6831
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6832
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6833 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
6834 0, 1, 0,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6835 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
6836 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
6837 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
6838 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
6839 value. */)
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6840 (window)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6841 Lisp_Object window;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6842 {
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6843 struct window *w = decode_window (window);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6844 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
6845 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6846 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))),
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6847 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
6848 Fcons (w->vertical_scroll_bar_type,
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
6849 Fcons (Qnil, Qnil))));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6850 }
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
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 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6855 Smooth scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6856 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6857
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6858 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
6859 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
6860 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
6861 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
6862 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
6863 (window, pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6864 Lisp_Object window, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6865 {
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6866 Lisp_Object result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6867 struct frame *f;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6868 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6869
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6870 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6871 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6872 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6873 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6874 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6875 f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6876
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6877 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
6878 result = (NILP (pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6879 ? 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
6880 : make_number (-w->vscroll));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6881 else
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6882 result = make_number (0);
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6883 return result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6884 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6885
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6886
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6887 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
6888 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
6889 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
6890 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
6891 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
6892 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
6893 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
6894 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
6895 result of this rounding.
338a1d04223d (Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents: 56456
diff changeset
6896 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
6897 (window, vscroll, pixels_p)
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6898 Lisp_Object window, vscroll, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6899 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6900 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6901 struct frame *f;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6902
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6903 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6904 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6905 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6906 CHECK_WINDOW (window);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6907 CHECK_NUMBER_OR_FLOAT (vscroll);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6908
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6909 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6910 f = XFRAME (w->frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6911
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6912 if (FRAME_WINDOW_P (f))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6913 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6914 int old_dy = w->vscroll;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6915
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6916 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
6917 ? 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
6918 : XFLOATINT (vscroll));
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6919 w->vscroll = min (w->vscroll, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6920
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6921 if (w->vscroll != old_dy)
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6922 {
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6923 /* 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
6924 area becomes larger than before. */
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6925 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
6926 adjust_glyphs (f);
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6927
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6928 /* Prevent redisplay shortcuts. */
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
6929 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
6930 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6931 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6932
55027
91ab946dfd86 (Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents: 54883
diff changeset
6933 return Fwindow_vscroll (window, pixels_p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6934 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6935
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6936
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6937 /* 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
6938 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
6939 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
6940
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6941 void
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6942 foreach_window (f, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6943 struct frame *f;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6944 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6945 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6946 {
100632
389db2f016a4 * frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents: 99745
diff changeset
6947 /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */
70736
6e5b403b5586 (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 70155
diff changeset
6948 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
6949 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
6950 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6951
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6952
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6953 /* 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
6954 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
6955 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
6956 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
6957
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6958 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6959 foreach_window_1 (w, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6960 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6961 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6962 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6963 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6964 int cont;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6965
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6966 for (cont = 1; w && cont;)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6967 {
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6968 if (!NILP (w->hchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6969 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
6970 else if (!NILP (w->vchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6971 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6972 else
30366
8dd313fc287d (foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents: 30362
diff changeset
6973 cont = fn (w, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6974
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6975 w = NILP (w->next) ? 0 : XWINDOW (w->next);
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6976 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6977
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6978 return cont;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6979 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6980
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6981
39952
17e0900cd156 Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39748
diff changeset
6982 /* 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
6983 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
6984 the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6985
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6986 static int
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6987 freeze_window_start (w, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6988 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6989 void *freeze_p;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6990 {
84376
584ae8393da8 (freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84357
diff changeset
6991 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
6992 || (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
6993 && (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
6994 || (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
6995 && ! 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
6996 && w == XWINDOW (Vminibuf_scroll_window)))))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6997 freeze_p = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6998
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6999 w->frozen_window_start_p = freeze_p != NULL;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7000 return 1;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7001 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7002
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7003
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7004 /* 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
7005 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
7006 means freeze the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7007
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7008 void
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7009 freeze_window_starts (f, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7010 struct frame *f;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7011 int freeze_p;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
7012 {
31903
3e0a1f91c149 (freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents: 31829
diff changeset
7013 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
7014 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7015
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7016
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7017 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7018 Initialization
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7019 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7020
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7021 /* Return 1 if window configurations C1 and C2
95550
e057f981a6b5 (Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95547
diff changeset
7022 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
7023
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7024 int
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7025 compare_window_configurations (c1, c2, ignore_positions)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7026 Lisp_Object c1, c2;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7027 int ignore_positions;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7028 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7029 register struct save_window_data *d1, *d2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7030 struct Lisp_Vector *sw1, *sw2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7031 int i;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7032
71844
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
7033 CHECK_WINDOW_CONFIGURATION (c1);
632e73258d36 (Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents: 71717
diff changeset
7034 CHECK_WINDOW_CONFIGURATION (c2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
7035
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7036 d1 = (struct save_window_data *) XVECTOR (c1);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7037 d2 = (struct save_window_data *) XVECTOR (c2);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7038 sw1 = XVECTOR (d1->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7039 sw2 = XVECTOR (d2->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7040
86162
e7cf3055e000 (struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85684
diff changeset
7041 if (d1->frame_cols != d2->frame_cols)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7042 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
7043 if (d1->frame_lines != d2->frame_lines)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7044 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
7045 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
7046 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7047 if (! EQ (d1->selected_frame, d2->selected_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7048 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7049 /* Don't compare the current_window field directly.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7050 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
7051 if (! EQ (d1->current_buffer, d2->current_buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7052 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7053 if (! ignore_positions)
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
7054 {
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
7055 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
7056 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
7057 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
7058 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
7059 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7060 /* Don't compare the root_window field.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7061 We don't require the two configurations
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7062 to use the same window object,
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7063 and the two root windows must be equivalent
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7064 if everything else compares equal. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7065 if (! EQ (d1->focus_frame, d2->focus_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7066 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7067
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7068 /* 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
7069 if (sw1->size != sw2->size)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7070 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7071
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7072 for (i = 0; i < sw1->size; i++)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7073 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7074 struct saved_window *p1, *p2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7075 int w1_is_current, w2_is_current;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7076
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7077 p1 = SAVED_WINDOW_N (sw1, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7078 p2 = SAVED_WINDOW_N (sw2, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7079
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7080 /* Verify that the current windows in the two
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7081 configurations correspond to each other. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7082 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
7083 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
7084
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7085 if (w1_is_current != w2_is_current)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7086 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7087
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7088 /* Verify that the corresponding windows do match. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7089 if (! EQ (p1->buffer, p2->buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7090 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7091 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
7092 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7093 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
7094 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7095 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
7096 return 0;
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7097 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
7098 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7099 if (! EQ (p1->display_table, p2->display_table))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7100 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7101 if (! EQ (p1->parent, p2->parent))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7102 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7103 if (! EQ (p1->prev, p2->prev))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7104 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7105 if (! ignore_positions)
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7106 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7107 if (! EQ (p1->hscroll, p2->hscroll))
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7108 return 0;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
7109 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
7110 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7111 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
7112 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7113 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
7114 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7115 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
7116 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7117 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
7118 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7119 }
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7120 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
7121 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7122 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
7123 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7124 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
7125 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7126 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
7127 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7128 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
7129 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7130 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
7131 return 0;
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7132 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
7133 return 0;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7134 }
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7135
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7136 return 1;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7137 }
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7138
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7139 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
7140 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
7141 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
7142 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
7143 and scrolling positions. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7144 (x, y)
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7145 Lisp_Object x, y;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7146 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7147 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
7148 return Qt;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7149 return Qnil;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7150 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
7151
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7152 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7153 init_window_once ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7154 {
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83005
diff changeset
7155 struct frame *f = make_initial_frame ();
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7156 XSETFRAME (selected_frame, f);
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7157 Vterminal_frame = selected_frame;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7158 minibuf_window = f->minibuffer_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7159 selected_window = f->selected_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
7160 last_nonminibuf_frame = f;
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
7161
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
7162 window_initialized = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7163 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7164
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7165 void
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7166 init_window ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7167 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7168 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7169 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7170
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7171 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7172 syms_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7173 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7174 Qscroll_up = intern_c_string ("scroll-up");
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7175 staticpro (&Qscroll_up);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7176
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7177 Qscroll_down = intern_c_string ("scroll-down");
69209
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7178 staticpro (&Qscroll_down);
b9ad41f39bf6 * xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 69104
diff changeset
7179
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7180 Qscroll_command = intern_c_string ("scroll-command");
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7181 staticpro (&Qscroll_command);
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7182
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7183 Fput (Qscroll_up, Qscroll_command, Qt);
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7184 Fput (Qscroll_down, Qscroll_command, Qt);
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7185
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7186 Qwindow_size_fixed = intern_c_string ("window-size-fixed");
25540
2b4bdd114899 (Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents: 25517
diff changeset
7187 staticpro (&Qwindow_size_fixed);
61755
71259596d397 (window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 61635
diff changeset
7188 Fset (Qwindow_size_fixed, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
7189
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7190 staticpro (&Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7191 Qwindow_configuration_change_hook
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7192 = intern_c_string ("window-configuration-change-hook");
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7193
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7194 Qwindowp = intern_c_string ("windowp");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7195 staticpro (&Qwindowp);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7196
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7197 Qwindow_configuration_p = intern_c_string ("window-configuration-p");
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7198 staticpro (&Qwindow_configuration_p);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7199
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7200 Qwindow_live_p = intern_c_string ("window-live-p");
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
7201 staticpro (&Qwindow_live_p);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
7202
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7203 Qdisplay_buffer = intern_c_string ("display-buffer");
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
7204 staticpro (&Qdisplay_buffer);
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95566
diff changeset
7205
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105769
diff changeset
7206 Qtemp_buffer_show_hook = intern_c_string ("temp-buffer-show-hook");
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
7207 staticpro (&Qtemp_buffer_show_hook);
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
7208
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7209 staticpro (&Vwindow_list);
43597
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
7210
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
7211 minibuf_selected_window = Qnil;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
7212 staticpro (&minibuf_selected_window);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7213
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7214 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
7215 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
7216 window_scroll_preserve_hpos = -1;
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7217 window_scroll_preserve_vpos = -1;
69342
12e65aa88734 Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69209
diff changeset
7218
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7219 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
7220 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
7221 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
7222 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
7223 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
7224 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
7225 Vtemp_buffer_show_function = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7226
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7227 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
7228 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
7229 Vminibuf_scroll_window = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7230
43281
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
7231 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
7232 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
7233 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
7234 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
7235 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
7236
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7237 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
7238 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
7239 Vother_window_scroll_buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7240
59677
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
7241 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
7242 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
7243 auto_window_vscroll_p = 1;
d762442d2c8f (auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents: 59342
diff changeset
7244
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7245 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
7246 doc: /* *Number of lines of continuity when scrolling by screenfuls. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7247 next_screen_context_lines = 2;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7248
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7249 DEFVAR_INT ("window-min-height", &window_min_height,
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7250 doc: /* Allow deleting windows less than this tall.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7251 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
7252 is counted as one line.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7253
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7254 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
7255 windows vertically. A value less than 1 is invalid. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7256 window_min_height = 4;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7257
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7258 DEFVAR_INT ("window-min-width", &window_min_width,
94515
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7259 doc: /* Allow deleting windows less than this wide.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7260 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
7261 the scrollbar.
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7262
b64e3d5c5852 (make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents: 93547
diff changeset
7263 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
7264 windows horizontally. A value less than 2 is invalid. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7265 window_min_width = 10;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7266
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7267 DEFVAR_LISP ("scroll-preserve-screen-position",
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7268 &Vscroll_preserve_screen_position,
95566
b3c0438c570b * window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95564
diff changeset
7269 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
7270 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
7271 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
7272 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
7273 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
7274 by full screens.
107852
4abde609aac9 Add variable `scroll-preserve-screen-position-commands'.
Juri Linkov <juri@jurta.org>
parents: 107666
diff changeset
7275 Any other value means point always keeps its screen position.
107871
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7276 Scroll commands should have the `scroll-command' property
d7b161b7a686 Add the `scroll-command' property.
Juri Linkov <juri@jurta.org>
parents: 107853
diff changeset
7277 on their symbols to be controlled by this variable. */);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7278 Vscroll_preserve_screen_position = Qnil;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
7279
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
7280 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
7281 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
7282 Vwindow_point_insertion_type = Qnil;
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
7283
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7284 DEFVAR_LISP ("window-configuration-change-hook",
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7285 &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
7286 doc: /* Functions to call when window configuration changes.
93068
3ca0c43ea37d (run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92192
diff changeset
7287 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
7288 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
7289 with the relevant frame selected. */);
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7290 Vwindow_configuration_change_hook = Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7291
103557
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7292 DEFVAR_LISP ("recenter-redisplay", &Vrecenter_redisplay,
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7293 doc: /* If non-nil, then the `recenter' command with a nil argument
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7294 the entire frame to be redrawn; the special value `tty' causes the
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7295 frame to be redrawn only if it is a tty frame. */);
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7296 Vrecenter_redisplay = Qtty;
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7297
f52eb7cf1c20 Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents: 100951
diff changeset
7298
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7299 defsubr (&Sselected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7300 defsubr (&Sminibuffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7301 defsubr (&Swindow_minibuffer_p);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7302 defsubr (&Swindowp);
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
7303 defsubr (&Swindow_live_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7304 defsubr (&Spos_visible_in_window_p);
72955
e7401fd40071 (Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents: 72907
diff changeset
7305 defsubr (&Swindow_line_height);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7306 defsubr (&Swindow_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7307 defsubr (&Swindow_height);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7308 defsubr (&Swindow_width);
78415
73900ddc75ee (window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents: 78260
diff changeset
7309 defsubr (&Swindow_full_width_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7310 defsubr (&Swindow_hscroll);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7311 defsubr (&Sset_window_hscroll);
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7312 defsubr (&Swindow_redisplay_end_trigger);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7313 defsubr (&Sset_window_redisplay_end_trigger);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7314 defsubr (&Swindow_edges);
51427
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7315 defsubr (&Swindow_pixel_edges);
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7316 defsubr (&Swindow_inside_edges);
ac7f678c586d (Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 51240
diff changeset
7317 defsubr (&Swindow_inside_pixel_edges);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7318 defsubr (&Scoordinates_in_window_p);
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7319 defsubr (&Swindow_at);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7320 defsubr (&Swindow_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7321 defsubr (&Swindow_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7322 defsubr (&Swindow_end);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7323 defsubr (&Sset_window_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7324 defsubr (&Sset_window_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7325 defsubr (&Swindow_dedicated_p);
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
7326 defsubr (&Sset_window_dedicated_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7327 defsubr (&Swindow_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7328 defsubr (&Sset_window_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7329 defsubr (&Snext_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7330 defsubr (&Sprevious_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7331 defsubr (&Sother_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7332 defsubr (&Sget_lru_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7333 defsubr (&Sget_largest_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7334 defsubr (&Sget_buffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7335 defsubr (&Sdelete_other_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7336 defsubr (&Sdelete_windows_on);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7337 defsubr (&Sreplace_buffer_in_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7338 defsubr (&Sdelete_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7339 defsubr (&Sset_window_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7340 defsubr (&Sselect_window);
53143
49489d2151bf (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents: 53129
diff changeset
7341 defsubr (&Sforce_window_update);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7342 defsubr (&Ssplit_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7343 defsubr (&Senlarge_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7344 defsubr (&Sshrink_window);
67156
33af3a25cca6 (adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents: 66711
diff changeset
7345 defsubr (&Sadjust_window_trailing_edge);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7346 defsubr (&Sscroll_up);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7347 defsubr (&Sscroll_down);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7348 defsubr (&Sscroll_left);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7349 defsubr (&Sscroll_right);
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
7350 defsubr (&Sother_window_for_scrolling);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7351 defsubr (&Sscroll_other_window);
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
7352 defsubr (&Sminibuffer_selected_window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7353 defsubr (&Srecenter);
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
7354 defsubr (&Swindow_text_height);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7355 defsubr (&Smove_to_window_line);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7356 defsubr (&Swindow_configuration_p);
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7357 defsubr (&Swindow_configuration_frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7358 defsubr (&Sset_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7359 defsubr (&Scurrent_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7360 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
7361 defsubr (&Swindow_tree);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7362 defsubr (&Sset_window_margins);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7363 defsubr (&Swindow_margins);
51207
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7364 defsubr (&Sset_window_fringes);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7365 defsubr (&Swindow_fringes);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7366 defsubr (&Sset_window_scroll_bars);
7e176ef34c10 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51049
diff changeset
7367 defsubr (&Swindow_scroll_bars);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7368 defsubr (&Swindow_vscroll);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7369 defsubr (&Sset_window_vscroll);
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7370 defsubr (&Scompare_window_configurations);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7371 defsubr (&Swindow_list);
95547
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7372 defsubr (&Swindow_parameters);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7373 defsubr (&Swindow_parameter);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7374 defsubr (&Sset_window_parameter);
f646247886e0 (Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents: 95481
diff changeset
7375
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7376 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7377
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7378 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7379 keys_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7380 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7381 initial_define_key (control_x_map, '1', "delete-other-windows");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7382 initial_define_key (control_x_map, '2', "split-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7383 initial_define_key (control_x_map, '0', "delete-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7384 initial_define_key (control_x_map, 'o', "other-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7385 initial_define_key (control_x_map, '^', "enlarge-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7386 initial_define_key (control_x_map, '<', "scroll-left");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7387 initial_define_key (control_x_map, '>', "scroll-right");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7388
107853
de5ba6f3514c Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.
Juri Linkov <juri@jurta.org>
parents: 107852
diff changeset
7389 initial_define_key (global_map, Ctl ('V'), "scroll-up-command");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7390 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window");
107853
de5ba6f3514c Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.
Juri Linkov <juri@jurta.org>
parents: 107852
diff changeset
7391 initial_define_key (meta_map, 'v', "scroll-down-command");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7392 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7393
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7394 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51674
diff changeset
7395 (do not change this comment) */