annotate src/window.c @ 88155:d7ddb3e565de

sync with trunk
author Henrik Enberg <henrik.enberg@telia.com>
date Mon, 16 Jan 2006 00:03:54 +0000
parents 23a1cea22d13
children
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.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 This file is part of GNU Emacs.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 GNU Emacs is free software; you can redistribute it and/or modify
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 681
diff changeset
10 the Free Software Foundation; either version 2, or (at your option)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 any later version.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 GNU General Public License for more details.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 along with GNU Emacs; see the file COPYING. If not, write to
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
21 Boston, MA 02110-1301, USA. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4570
diff changeset
23 #include <config.h>
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "lisp.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include "buffer.h"
31117
f390b90e3495 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30777
diff changeset
26 #include "keyboard.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39682
diff changeset
27 #include "keymap.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
28 #include "frame.h"
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "window.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "commands.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "indent.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "termchar.h"
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "disptab.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
34 #include "dispextern.h"
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
35 #include "blockinput.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
36 #include "intervals.h"
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
37
21825
697991d2a2c4 Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents: 21533
diff changeset
38 #ifdef HAVE_X_WINDOWS
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
39 #include "xterm.h"
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
40 #endif /* HAVE_X_WINDOWS */
27633
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
41 #ifdef WINDOWSNT
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
42 #include "w32term.h"
ab6c81c6edf8 [WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents: 27553
diff changeset
43 #endif
27956
8d38dbe58989 [MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents: 27869
diff changeset
44 #ifdef MSDOS
8d38dbe58989 [MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents: 27869
diff changeset
45 #include "msdos.h"
8d38dbe58989 [MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents: 27869
diff changeset
46 #endif
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44744
diff changeset
47 #ifdef MAC_OS
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32710
diff changeset
48 #include "macterm.h"
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32710
diff changeset
49 #endif
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
50
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
51
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
52 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
41736
d583dac59ea4 (Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
Jason Rumney <jasonr@gnu.org>
parents: 41719
diff changeset
53 Lisp_Object Qwindow_size_fixed;
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
54 extern Lisp_Object Qleft_margin, Qright_margin;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
56 static int displayed_window_lines P_ ((struct window *));
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
57 static struct window *decode_window P_ ((Lisp_Object));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
58 static int count_windows P_ ((struct window *));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
59 static int get_leaf_windows P_ ((struct window *, struct window **, int));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
60 static void window_scroll P_ ((Lisp_Object, int, int, int));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
61 static void window_scroll_pixel_based P_ ((Lisp_Object, int, int, int));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
62 static void window_scroll_line_based P_ ((Lisp_Object, int, int, int));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
63 static int window_min_size_1 P_ ((struct window *, int));
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
64 static int window_min_size P_ ((struct window *, int, int, int *));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
65 static void size_window P_ ((Lisp_Object, int, int, int));
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
66 static int freeze_window_start P_ ((struct window *, void *));
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
67 static int window_fixed_size_p P_ ((struct window *, int, int));
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
68 static void enlarge_window P_ ((Lisp_Object, int, int));
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
69 static Lisp_Object window_list P_ ((void));
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
70 static int add_window_to_list P_ ((struct window *, void *));
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
71 static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
72 Lisp_Object));
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
73 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object,
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
74 Lisp_Object, int));
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
75 static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *,
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
76 Lisp_Object *));
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
77 static int foreach_window_1 P_ ((struct window *,
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
78 int (* fn) (struct window *, void *),
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
79 void *));
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
80 static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
81
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82 /* This is the window in which the terminal's cursor should
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
83 be left when nothing is being done with it. This must
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
84 always be a leaf window, and its buffer is selected by
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85 the top level editing loop at the end of each command.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87 This value is always the same as
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
88 FRAME_SELECTED_WINDOW (selected_frame). */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 Lisp_Object selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
92 /* A list of all windows for use by next_window and Fwindow_list.
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
93 Functions creating or deleting windows should invalidate this cache
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
94 by setting it to nil. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
95
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
96 Lisp_Object Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
97
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
98 /* The mini-buffer window of the selected frame.
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
99 Note that you cannot test for mini-bufferness of an arbitrary window
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
100 by comparing against this; but you can test for mini-bufferness of
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 the selected window. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
102
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 Lisp_Object minibuf_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
105 /* Non-nil means it is the window whose mode line should be
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
106 shown as the selected window when the minibuffer is selected. */
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
107
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
108 Lisp_Object minibuf_selected_window;
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
109
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 /* Non-nil means it is the window for C-M-v to scroll
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
111 when the mini-buffer is selected. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
112
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 Lisp_Object Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115 /* Non-nil means this is the buffer whose window C-M-v should scroll. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
116
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 Lisp_Object Vother_window_scroll_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 /* Non-nil means it's function to call to display temp buffers. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
120
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121 Lisp_Object Vtemp_buffer_show_function;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
123 /* Non-zero means line and page scrolling on tall lines (with images)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
124 does partial scrolling by modifying window-vscroll. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
125
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
126 int auto_window_vscroll_p;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
127
43281
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
128 /* Non-zero means to use mode-line-inactive face in all windows but the
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
129 selected-window and the minibuffer-scroll-window when the
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
130 minibuffer is active. */
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
131 int mode_line_in_non_selected_windows;
43241
5558e7582f1f (Vmode_line_in_non_selected_windows): New variable.
Kim F. Storm <storm@cua.dk>
parents: 42875
diff changeset
132
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 /* If a window gets smaller than either of these, it is removed. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
134
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
135 EMACS_INT window_min_height;
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
136 EMACS_INT window_min_width;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 /* Nonzero implies Fdisplay_buffer should create windows. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
139
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 int pop_up_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
142 /* Nonzero implies make new frames for Fdisplay_buffer. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
143
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
144 int pop_up_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145
30560
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
146 /* Nonzero means reuse existing frames for displaying buffers. */
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
147
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
148 int display_buffer_reuse_frames;
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
149
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 /* Non-nil means use this function instead of default */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
151
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
152 Lisp_Object Vpop_up_frame_function;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 /* Function to call to handle Fdisplay_buffer. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
155
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 Lisp_Object Vdisplay_buffer_function;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157
34261
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
158 /* Non-nil means that Fdisplay_buffer should even the heights of windows. */
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
159
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
160 Lisp_Object Veven_window_heights;
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
161
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
162 /* List of buffer *names* for buffers that should have their own frames. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
163
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
164 Lisp_Object Vspecial_display_buffer_names;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
165
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
166 /* List of regexps for buffer names that should have their own frames. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
167
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
168 Lisp_Object Vspecial_display_regexps;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
169
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
170 /* Function to pop up a special frame. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
171
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
172 Lisp_Object Vspecial_display_function;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
173
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
174 /* List of buffer *names* for buffers to appear in selected window. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
175
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
176 Lisp_Object Vsame_window_buffer_names;
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
177
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
178 /* List of regexps for buffer names to appear in selected window. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
179
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
180 Lisp_Object Vsame_window_regexps;
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
181
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
182 /* Hook run at end of temp_output_buffer_show. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
183
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
184 Lisp_Object Qtemp_buffer_show_hook;
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
185
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
186 /* Fdisplay_buffer always splits the largest window
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 if that window is more than this high. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
188
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
189 EMACS_INT split_height_threshold;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 /* Number of lines of continuity in scrolling by screenfuls. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
192
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
193 EMACS_INT next_screen_context_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 /* Incremented for each window created. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
196
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 static int sequence_number;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
199 /* Nonzero after init_window_once has finished. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
200
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
201 static int window_initialized;
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
202
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
203 /* Hook to run when window config changes. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
204
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
205 Lisp_Object Qwindow_configuration_change_hook;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
206 Lisp_Object Vwindow_configuration_change_hook;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
207
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
208 /* Non-nil means scroll commands try to put point
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
209 at the same screen height as previously. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
210
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
211 Lisp_Object Vscroll_preserve_screen_position;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
212
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
213 /* Incremented by 1 whenever a window is deleted. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
214
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
215 int window_deletion_count;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
216
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
217 #if 0 /* This isn't used anywhere. */
17962
8621a73a8890 (syms_of_window): Initialize inhibit_frame_unsplittable.
Richard M. Stallman <rms@gnu.org>
parents: 17955
diff changeset
218 /* Nonzero means we can split a frame even if it is "unsplittable". */
17955
3140e48262f9 frame-override-unsplittable/inhibit-frame-unsplittable name change.
Simon Marshall <simon@gnu.org>
parents: 17952
diff changeset
219 static int inhibit_frame_unsplittable;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
220 #endif /* 0 */
17540
eb82c4de9dea (frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17365
diff changeset
221
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43624
diff changeset
222 extern EMACS_INT scroll_margin;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
223
14149
0d67df27dc2a (Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents: 14089
diff changeset
224 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
227 doc: /* Returns t if OBJECT is a window. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
228 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
229 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
231 return WINDOWP (object) ? Qt : Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
234 DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
235 doc: /* Returns t if OBJECT is a window which is currently visible. */)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
236 (object)
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
237 Lisp_Object object;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
238 {
35398
ef34ddc12a7d * window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 35396
diff changeset
239 return WINDOW_LIVE_P (object) ? Qt : Qnil;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
240 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
241
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 Lisp_Object
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 make_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
245 Lisp_Object val;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 register struct window *p;
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
247
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
248 p = allocate_window ();
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
249 ++sequence_number;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
250 XSETFASTINT (p->sequence_number, sequence_number);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
251 XSETFASTINT (p->left_col, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
252 XSETFASTINT (p->top_line, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
253 XSETFASTINT (p->total_lines, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
254 XSETFASTINT (p->total_cols, 0);
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
255 XSETFASTINT (p->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
256 XSETFASTINT (p->min_hscroll, 0);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
257 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 p->start = Fmake_marker ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 p->pointm = Fmake_marker ();
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
260 XSETFASTINT (p->use_time, 0);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
261 p->frame = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 p->display_table = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 p->dedicated = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
264 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
265 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
266 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
267 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
268 p->desired_matrix = p->current_matrix = 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
269 p->nrows_scale_factor = p->ncols_scale_factor = 1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
270 p->phys_cursor_type = -1;
43620
8a5d6239662c (make_window, replace_window): Initialize phys_cursor_width.
Kim F. Storm <storm@cua.dk>
parents: 43597
diff changeset
271 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
272 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
273 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
274 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
275 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
276 p->vscroll = 0;
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
277 XSETWINDOW (val, p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
278 XSETFASTINT (p->last_point, 0);
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
279 p->frozen_window_start_p = 0;
44744
8c52c2bf3b3f (make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents: 44649
diff changeset
280 p->last_cursor_off_p = p->cursor_off_p = 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
281 p->left_margin_cols = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
282 p->right_margin_cols = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
283 p->left_fringe_width = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
284 p->right_fringe_width = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
285 p->fringes_outside_margins = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
286 p->scroll_bar_width = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
287 p->vertical_scroll_bar_type = Qt;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
288
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
289 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 return val;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
294 doc: /* Return the window that the cursor now appears in and commands apply to. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
295 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297 return selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
298 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
300 DEFUN ("minibuffer-window", Fminibuffer_window, Sminibuffer_window, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
301 doc: /* Return the window used now for minibuffers.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
302 If the optional argument FRAME is specified, return the minibuffer window
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
303 used by that frame. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
304 (frame)
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
305 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 {
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
307 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
308 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
309 CHECK_LIVE_FRAME (frame);
1123
55e605674fb1 * window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents: 1049
diff changeset
310 return FRAME_MINIBUF_WINDOW (XFRAME (frame));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
313 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
314 doc: /* Returns non-nil if WINDOW is a minibuffer window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
315 WINDOW defaults to the selected window. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
316 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319 struct window *w = decode_window (window);
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
320 return MINI_WINDOW_P (w) ? Qt : Qnil;
32710
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
321 }
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
322
cd7dca826a03 (pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32426
diff changeset
323
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324 DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
325 Spos_visible_in_window_p, 0, 3, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
326 doc: /* Return non-nil if position POS is currently on the frame in WINDOW.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
327 Return nil if that position is scrolled vertically out of view.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
328 If a character is only partially visible, nil is returned, unless the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
329 optional argument PARTIALLY is non-nil.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
330 If POS is only out of view because of horizontal scrolling, return non-nil.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
331 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
332
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
333 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
334 return value is a list (X Y PARTIAL) where X and Y are the pixel coordinates
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
335 relative to the top left corner of the window. PARTIAL is nil if the character
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
336 after POS is fully visible; otherwise it is a cons (RTOP . RBOT) where RTOP
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
337 and RBOT are the number of pixels invisible at the top and bottom of the row. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
338 (pos, window, partially)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
339 Lisp_Object pos, window, partially;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 register int posint;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343 register struct buffer *buf;
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
344 struct text_pos top;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
345 Lisp_Object in_window = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
346 int rtop, rbot, fully_p = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
347 int x, y;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
348
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
349 w = decode_window (window);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
350 buf = XBUFFER (w->buffer);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
351 SET_TEXT_POS_FROM_MARKER (top, w->start);
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
352
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
353 if (!NILP (pos))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
355 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 posint = XINT (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 }
32937
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
358 else if (w == XWINDOW (selected_window))
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
359 posint = PT;
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
360 else
dc58e218a878 (Fpos_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents: 32928
diff changeset
361 posint = XMARKER (w->pointm)->charpos;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
362
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
363 /* If position is above window start or outside buffer boundaries,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
364 or if window start is out of range, position is not visible. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
365 if (posint >= CHARPOS (top)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
366 && posint <= BUF_ZV (buf)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
367 && CHARPOS (top) >= BUF_BEGV (buf)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
368 && CHARPOS (top) <= BUF_ZV (buf)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
369 && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, NILP (partially))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
370 && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
371 in_window = Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
372
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
373 if (!NILP (in_window) && !NILP (partially))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
374 in_window = Fcons (make_number (x),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
375 Fcons (make_number (y),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
376 Fcons ((fully_p ? Qnil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
377 : Fcons (make_number (rtop),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
378 make_number (rbot))),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
379 Qnil)));
25300
096b78b6cc2e (Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 25268
diff changeset
380 return in_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
381 }
32871
361743be1fa8 (pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 32824
diff changeset
382
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
383
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384 static struct window *
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385 decode_window (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
388 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 return XWINDOW (selected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
391 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
392 return XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
395 static struct window *
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
396 decode_any_window (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
397 register Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
398 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
399 if (NILP (window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
400 return XWINDOW (selected_window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
401
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
402 CHECK_WINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
403 return XWINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
404 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
405
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
407 doc: /* Return the buffer that WINDOW is displaying.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
408 WINDOW defaults to the selected window. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
409 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
411 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 return decode_window (window)->buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
416 doc: /* Return the number of lines in WINDOW (including its mode line). */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
417 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
419 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
420 return decode_any_window (window)->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
421 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423 DEFUN ("window-width", Fwindow_width, Swindow_width, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
424 doc: /* Return the number of display columns in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
425 This is the width that is usable columns available for text in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
426 If you want to find out how many columns WINDOW takes up,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
427 use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
428 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
430 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
431 return make_number (window_box_text_cols (decode_any_window (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
434 DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
435 doc: /* Return the number of columns by which WINDOW is scrolled from left margin. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
436 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
438 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 return decode_window (window)->hscroll;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
443 doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
444 Return NCOL. NCOL should be zero or positive.
45645
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
445
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
446 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the
6e2471fb2c1c (Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45584
diff changeset
447 window so that the location of point becomes invisible. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
448 (window, ncol)
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
449 Lisp_Object window, ncol;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
450 {
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
451 struct window *w = decode_window (window);
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
452 int hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
454 CHECK_NUMBER (ncol);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
455 hscroll = max (0, XINT (ncol));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
456
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
457 /* Prevent redisplay shortcuts when changing the hscroll. */
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
458 if (XINT (w->hscroll) != hscroll)
25375
919b568e4108 (Fset_window_hscroll): Set
Gerd Moellmann <gerd@gnu.org>
parents: 25356
diff changeset
459 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
460
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
461 w->hscroll = make_number (hscroll);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 return ncol;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
465 DEFUN ("window-redisplay-end-trigger", Fwindow_redisplay_end_trigger,
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
466 Swindow_redisplay_end_trigger, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
467 doc: /* Return WINDOW's redisplay end trigger value.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
468 See `set-window-redisplay-end-trigger' for more information. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
469 (window)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
470 Lisp_Object window;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
471 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
472 return decode_window (window)->redisplay_end_trigger;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
473 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
474
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
475 DEFUN ("set-window-redisplay-end-trigger", Fset_window_redisplay_end_trigger,
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
476 Sset_window_redisplay_end_trigger, 2, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
477 doc: /* Set WINDOW's redisplay end trigger value to VALUE.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
478 VALUE should be a buffer position (typically a marker) or nil.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
479 If it is a buffer position, then if redisplay in WINDOW reaches a position
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
480 beyond VALUE, the functions in `redisplay-end-trigger-functions' are called
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
481 with two arguments: WINDOW, and the end trigger value.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
482 Afterwards the end-trigger value is reset to nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
483 (window, value)
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
484 register Lisp_Object window, value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
485 {
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
486 register struct window *w;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
487
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
488 w = decode_window (window);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
489 w->redisplay_end_trigger = value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
490 return value;
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
491 }
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
492
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
494 doc: /* Return a list of the edge coordinates of WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
495 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
496 RIGHT is one more than the rightmost column occupied by WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
497 and BOTTOM is one more than the bottommost row occupied by WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
498 The edges include the space used by the window's scroll bar,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
499 display margins, fringes, header line, and mode line, if it has them.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
500 To get the edges of the actual text area, use `window-inside-edges'. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
501 (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
502 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
503 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
504 register struct window *w = decode_any_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
505
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
506 return Fcons (make_number (WINDOW_LEFT_EDGE_COL (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
507 Fcons (make_number (WINDOW_TOP_EDGE_LINE (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
508 Fcons (make_number (WINDOW_RIGHT_EDGE_COL (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
509 Fcons (make_number (WINDOW_BOTTOM_EDGE_LINE (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
510 Qnil))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
511 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
512
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
513 DEFUN ("window-pixel-edges", Fwindow_pixel_edges, Swindow_pixel_edges, 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
514 doc: /* Return a list of the edge pixel coordinates of WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
515 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
516 RIGHT is one more than the rightmost x position occupied by WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
517 and BOTTOM is one more than the bottommost y position occupied by WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
518 The pixel edges include the space used by the window's scroll bar,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
519 display margins, fringes, header line, and mode line, if it has them.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
520 To get the edges of the actual text area, use `window-inside-pixel-edges'. */)
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 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
524 register struct window *w = decode_any_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
525
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
526 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
527 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
528 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
529 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
530 Qnil))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
531 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
532
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
533 DEFUN ("window-inside-edges", Fwindow_inside_edges, Swindow_inside_edges, 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
534 doc: /* Return a list of the edge coordinates of WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
535 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
536 RIGHT is one more than the rightmost column used by text in WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
537 and BOTTOM is one more than the bottommost row used by text in WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
538 The inside edges do not include the space used by the window's scroll bar,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
539 display margins, fringes, header line, and/or mode line. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
540 (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
541 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
542 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
543 register struct window *w = decode_any_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
544
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
545 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
546 + WINDOW_LEFT_MARGIN_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
547 + WINDOW_LEFT_FRINGE_COLS (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
548 make_number (WINDOW_TOP_EDGE_LINE (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
549 + WINDOW_HEADER_LINE_LINES (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
550 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
551 - WINDOW_RIGHT_MARGIN_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
552 - WINDOW_RIGHT_FRINGE_COLS (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
553 make_number (WINDOW_BOTTOM_EDGE_LINE (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
554 - WINDOW_MODE_LINE_LINES (w)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
555 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
556
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
557 DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
558 doc: /* Return a list of the edge pixel coordinates of WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
559 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
560 RIGHT is one more than the rightmost x position used by text in WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
561 and BOTTOM is one more than the bottommost y position used by text in WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
562 The inside edges do not include the space used by the window's scroll bar,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
563 display margins, fringes, header line, and/or mode line. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
564 (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
565 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
566 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
567 register struct window *w = decode_any_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
568
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
569 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
570 + WINDOW_LEFT_MARGIN_WIDTH (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
571 + WINDOW_LEFT_FRINGE_WIDTH (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
572 make_number (WINDOW_TOP_EDGE_Y (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
573 + WINDOW_HEADER_LINE_HEIGHT (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
574 make_number (WINDOW_BOX_RIGHT_EDGE_X (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
575 - WINDOW_RIGHT_MARGIN_WIDTH (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
576 - WINDOW_RIGHT_FRINGE_WIDTH (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
577 make_number (WINDOW_BOTTOM_EDGE_Y (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
578 - WINDOW_MODE_LINE_HEIGHT (w)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
581 /* Test if the character at column *X, row *Y is within window W.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
582 If it is not, return ON_NOTHING;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
583 if it is in the window's text area,
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
584 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
585 of the window, and
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
586 return ON_TEXT;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
587 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
588 if it is on the border between the window and its right sibling,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
589 return ON_VERTICAL_BORDER.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
590 if it is on a scroll bar,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
591 return ON_SCROLL_BAR.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
592 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
593 if it is in left or right fringe of the window,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
594 return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
595 to window-relative coordinates;
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
596 if it is in the marginal area to the left/right of the window,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
597 return ON_LEFT_MARGIN or ON_RIGHT_MARGIN, and convert *X and *Y
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
598 to window-relative coordinates.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
599
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
600 X and Y are frame relative pixel coordinates. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
601
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
602 static enum window_part
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
603 coordinates_in_window (w, x, y)
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
604 register struct window *w;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
605 register int *x, *y;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
606 {
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
607 struct frame *f = XFRAME (WINDOW_FRAME (w));
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
608 int left_x, right_x, top_y, bottom_y;
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
609 enum window_part part;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
610 int ux = FRAME_COLUMN_WIDTH (f);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
611 int x0 = WINDOW_LEFT_EDGE_X (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
612 int x1 = WINDOW_RIGHT_EDGE_X (w);
36127
f03dfbb443ce (coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents: 36068
diff changeset
613 /* The width of the area where the vertical line can be dragged.
f03dfbb443ce (coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents: 36068
diff changeset
614 (Between mode lines for instance. */
f03dfbb443ce (coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents: 36068
diff changeset
615 int grabbable_width = ux;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
616 int lmargin_width, rmargin_width, text_left, text_right;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
617
28918
e42cd428f056 (coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents: 28726
diff changeset
618 /* In what's below, we subtract 1 when computing right_x because we
e42cd428f056 (coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents: 28726
diff changeset
619 want the rightmost pixel, which is given by left_pixel+width-1. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
620 if (w->pseudo_window_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
621 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
622 left_x = 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
623 right_x = WINDOW_TOTAL_WIDTH (w) - 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
624 top_y = WINDOW_TOP_EDGE_Y (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
625 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
626 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
627 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
628 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
629 left_x = WINDOW_BOX_LEFT_EDGE_X (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
630 right_x = WINDOW_BOX_RIGHT_EDGE_X (w) - 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
631 top_y = WINDOW_TOP_EDGE_Y (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
632 bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
633 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
634
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
635 /* Outside any interesting row? */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
636 if (*y < top_y || *y >= bottom_y)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
637 return ON_NOTHING;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
638
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
639 /* On the mode line or header line? If it's near the start of
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
640 the mode or header line of window that's has a horizontal
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
641 sibling, say it's on the vertical line. That's to be able
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
642 to resize windows horizontally in case we're using toolkit
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
643 scroll bars. */
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
644
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
645 if (WINDOW_WANTS_MODELINE_P (w)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
646 && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w))
33957
1436ae066de4 (coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents: 33619
diff changeset
647 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
648 part = ON_MODE_LINE;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
649
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
650 header_vertical_border_check:
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
651 /* We're somewhere on the mode line. We consider the place
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
652 between mode lines of horizontally adjacent mode lines
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
653 as the vertical border. If scroll bars on the left,
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
654 return the right window. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
655 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
656 || WINDOW_RIGHTMOST_P (w))
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
657 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
658 if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
659 return ON_VERTICAL_BORDER;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
660 }
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
661 else
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
662 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
663 if (abs (*x - x1) < grabbable_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
664 return ON_VERTICAL_BORDER;
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
665 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
666
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
667 if (*x < x0 || *x >= x1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
668 return ON_NOTHING;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
669
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
670 /* Convert X and Y to window relative coordinates.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
671 Mode line starts at left edge of window. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
672 *x -= x0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
673 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
674 return part;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
675 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
676
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
677 if (WINDOW_WANTS_HEADER_LINE_P (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
678 && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
679 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
680 part = ON_HEADER_LINE;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
681 goto header_vertical_border_check;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
682 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
683
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
684 if (*x < x0 || *x >= x1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
685 return ON_NOTHING;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
686
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
687 /* Outside any interesting column? */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
688 if (*x < left_x || *x > right_x)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
689 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
690 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
691 return ON_SCROLL_BAR;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
692 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
693
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
694 lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
695 rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
696
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
697 text_left = window_box_left (w, TEXT_AREA);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
698 text_right = text_left + window_box_width (w, TEXT_AREA);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
699
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
700 if (FRAME_WINDOW_P (f))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
701 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
702 if (!w->pseudo_window_p
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
703 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
704 && !WINDOW_RIGHTMOST_P (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
705 && (abs (*x - right_x) < grabbable_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
706 return ON_VERTICAL_BORDER;
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
707 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
708 else
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
709 {
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
710 /* Need to say "*x > right_x" rather than >=, since on character
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
711 terminals, the vertical line's x coordinate is right_x. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
712 if (!w->pseudo_window_p
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
713 && !WINDOW_RIGHTMOST_P (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
714 && *x > right_x - ux)
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
715 {
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
716 /* On the border on the right side of the window? Assume that
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
717 this area begins at RIGHT_X minus a canonical char width. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
718 return ON_VERTICAL_BORDER;
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
719 }
34097
0225d8e15f2c (coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents: 34090
diff changeset
720 }
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
721
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
722 if (*x < text_left)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
723 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
724 if (lmargin_width > 0
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
725 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
726 ? (*x >= left_x + WINDOW_LEFT_FRINGE_WIDTH (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
727 : (*x < left_x + lmargin_width)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
728 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
729 *x -= left_x;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
730 if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
731 *x -= WINDOW_LEFT_FRINGE_WIDTH (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
732 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
733 return ON_LEFT_MARGIN;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
734 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
735
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
736 /* Convert X and Y to window-relative pixel coordinates. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
737 *x -= left_x;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
738 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
739 return ON_LEFT_FRINGE;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
740 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
741
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
742 if (*x >= text_right)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
743 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
744 if (rmargin_width > 0
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
745 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
746 ? (*x < right_x - WINDOW_RIGHT_FRINGE_WIDTH (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
747 : (*x >= right_x - rmargin_width)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
748 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
749 *x -= right_x - rmargin_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
750 if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
751 *x += WINDOW_RIGHT_FRINGE_WIDTH (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
752 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
753 return ON_RIGHT_MARGIN;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
754 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
755
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
756 /* Convert X and Y to window-relative pixel coordinates. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
757 *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
758 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
759 return ON_RIGHT_FRINGE;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
760 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
761
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
762 /* Everything special ruled out - must be on text area */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
763 *x -= text_left;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
764 *y -= top_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
765 return ON_TEXT;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
766 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
767
34640
263ac9dec8b8 (coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents: 34615
diff changeset
768
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
769 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
770 Scoordinates_in_window_p, 2, 2, 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
771 doc: /* Return non-nil if COORDINATES are in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
772 COORDINATES is a cons of the form (X . Y), X and Y being distances
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
773 measured in characters from the upper-left corner of the frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
774 \(0 . 0) denotes the character in the upper left corner of the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
775 frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
776 If COORDINATES are in the text portion of WINDOW,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
777 the coordinates relative to the window are returned.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
778 If they are in the mode line of WINDOW, `mode-line' is returned.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
779 If they are in the top mode line of WINDOW, `header-line' is returned.
41127
d7459915009d Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 40656
diff changeset
780 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
781 If they are in the right fringe of WINDOW, `right-fringe' is returned.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
782 If they are on the border between WINDOW and its right sibling,
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
783 `vertical-line' is returned.
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
784 If they are in the windows's left or right marginal areas, `left-margin'\n\
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
785 or `right-margin' is returned. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
786 (coordinates, window)
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
787 register Lisp_Object coordinates, window;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
788 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
789 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
790 struct frame *f;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
791 int x, y;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
792 Lisp_Object lx, ly;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
793
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
794 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
795 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
796 f = XFRAME (w->frame);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
797 CHECK_CONS (coordinates);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
798 lx = Fcar (coordinates);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
799 ly = Fcdr (coordinates);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
800 CHECK_NUMBER_OR_FLOAT (lx);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
801 CHECK_NUMBER_OR_FLOAT (ly);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
802 x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
803 y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
804
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
805 switch (coordinates_in_window (w, &x, &y))
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
806 {
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
807 case ON_NOTHING:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
808 return Qnil;
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
809
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
810 case ON_TEXT:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
811 /* X and Y are now window relative pixel coordinates. Convert
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
812 them to canonical char units before returning them. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
813 return Fcons (FRAME_CANON_X_FROM_PIXEL_X (f, x),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
814 FRAME_CANON_Y_FROM_PIXEL_Y (f, y));
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
815
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
816 case ON_MODE_LINE:
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
817 return Qmode_line;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
818
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
819 case ON_VERTICAL_BORDER:
732
a8d94735277e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 722
diff changeset
820 return Qvertical_line;
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
821
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
822 case ON_HEADER_LINE:
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
823 return Qheader_line;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
824
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
825 case ON_LEFT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
826 return Qleft_fringe;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
827
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
828 case ON_RIGHT_FRINGE:
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
829 return Qright_fringe;
25315
79bb4978ab2e (Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents: 25300
diff changeset
830
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
831 case ON_LEFT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
832 return Qleft_margin;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
833
44535
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
834 case ON_RIGHT_MARGIN:
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
835 return Qright_margin;
ee637a721e86 (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents: 44264
diff changeset
836
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
837 case ON_SCROLL_BAR:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
838 /* Historically we are supposed to return nil in this case. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
839 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
840
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
841 default:
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
842 abort ();
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
843 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
844 }
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
845
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
846
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
847 /* Callback for foreach_window, used in window_from_coordinates.
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
848 Check if window W contains coordinates specified by USER_DATA which
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
849 is actually a pointer to a struct check_window_data CW.
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
850
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
851 Check if window W contains coordinates *CW->x and *CW->y. If it
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
852 does, return W in *CW->window, as Lisp_Object, and return in
30777
3e4912d77e89 Fix embedded comment.
Dave Love <fx@gnu.org>
parents: 30743
diff changeset
853 *CW->part the part of the window under coordinates *X,*Y. Return
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
854 zero from this function to stop iterating over windows. */
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
855
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
856 struct check_window_data
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
857 {
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
858 Lisp_Object *window;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
859 int *x, *y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
860 enum window_part *part;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
861 };
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
862
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
863 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
864 check_window_containing (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
865 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
866 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
867 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
868 struct check_window_data *cw = (struct check_window_data *) user_data;
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
869 enum window_part found;
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
870 int continue_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
871
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
872 found = coordinates_in_window (w, cw->x, cw->y);
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
873 if (found != ON_NOTHING)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
874 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
875 *cw->part = found;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
876 XSETWINDOW (*cw->window, w);
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
877 continue_p = 0;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
878 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
879
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
880 return continue_p;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
881 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
882
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
883
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
884 /* Find the window containing frame-relative pixel position X/Y and
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
885 return it as a Lisp_Object.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
886
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
887 If X, Y is on one of the window's special `window_part' elements,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
888 set *PART to the id of that element, and return X and Y converted
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
889 to window relative coordinates in WX and WY.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
890
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
891 If there is no window under X, Y return nil and leave *PART
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
892 unmodified. TOOL_BAR_P non-zero means detect tool-bar windows.
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
893
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
894 This function was previously implemented with a loop cycling over
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
895 windows with Fnext_window, and starting with the frame's selected
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
896 window. It turned out that this doesn't work with an
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
897 implementation of next_window using Vwindow_list, because
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
898 FRAME_SELECTED_WINDOW (F) is not always contained in the window
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
899 tree of F when this function is called asynchronously from
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
900 note_mouse_highlight. The original loop didn't terminate in this
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
901 case. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
902
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 Lisp_Object
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
904 window_from_coordinates (f, x, y, part, wx, wy, tool_bar_p)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
905 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
906 int x, y;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
907 enum window_part *part;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
908 int *wx, *wy;
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
909 int tool_bar_p;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
910 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
911 Lisp_Object window;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
912 struct check_window_data cw;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
913 enum window_part dummy;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
914
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
915 if (part == 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
916 part = &dummy;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
917
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
918 window = Qnil;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
919 cw.window = &window, cw.x = &x, cw.y = &y; cw.part = part;
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
920 foreach_window (f, check_window_containing, &cw);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
921
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
922 /* If not found above, see if it's in the tool bar window, if a tool
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
923 bar exists. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
924 if (NILP (window)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
925 && tool_bar_p
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
926 && WINDOWP (f->tool_bar_window)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
927 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0
35800
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
928 && (coordinates_in_window (XWINDOW (f->tool_bar_window), &x, &y)
fe8277459ef3 (enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents: 35772
diff changeset
929 != ON_NOTHING))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
930 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
931 *part = ON_TEXT;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
932 window = f->tool_bar_window;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
933 }
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
934
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
935 if (wx) *wx = x;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
936 if (wy) *wy = y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
937
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
938 return window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940
681
026f978690be *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 555
diff changeset
941 DEFUN ("window-at", Fwindow_at, Swindow_at, 2, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
942 doc: /* Return window containing coordinates X and Y on FRAME.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
943 If omitted, FRAME defaults to the currently selected frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
944 The top left corner of the frame is considered to be row 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
945 column 0. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
946 (x, y, frame)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
947 Lisp_Object x, y, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
948 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
949 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
950
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
951 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
952 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
953 CHECK_LIVE_FRAME (frame);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
954 f = XFRAME (frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
955
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
956 /* Check that arguments are integers or floats. */
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
957 CHECK_NUMBER_OR_FLOAT (x);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
958 CHECK_NUMBER_OR_FLOAT (y);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
959
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
960 return window_from_coordinates (f,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
961 (FRAME_PIXEL_X_FROM_CANON_X (f, x)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
962 + FRAME_INTERNAL_BORDER_WIDTH (f)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
963 (FRAME_PIXEL_Y_FROM_CANON_Y (f, y)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
964 + FRAME_INTERNAL_BORDER_WIDTH (f)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
965 0, 0, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
968 DEFUN ("window-point", Fwindow_point, Swindow_point, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
969 doc: /* Return current value of point in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
970 For a nonselected window, this is the value point would have
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
971 if that window were selected.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
972
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
973 Note that, when WINDOW is the selected window and its buffer
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
974 is also currently selected, the value returned is the same as (point).
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
975 It would be more strictly correct to return the `top-level' value
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
976 of point, outside of any save-excursion forms.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
977 But that is hard to define. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
978 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
979 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
981 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
982
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
983 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
984 && current_buffer == XBUFFER (w->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
985 return Fpoint ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
986 return Fmarker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
987 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
988
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
989 DEFUN ("window-start", Fwindow_start, Swindow_start, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
990 doc: /* Return position at which display currently starts in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
991 This is updated by redisplay or by calling `set-window-start'. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
992 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
993 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 return Fmarker_position (decode_window (window)->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
998 /* This is text temporarily removed from the doc string below.
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
999
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1000 This function returns nil if the position is not currently known.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1001 That happens when redisplay is preempted and doesn't finish.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1002 If in that case you want to compute where the end of the window would
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1003 have been if redisplay had finished, do this:
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1004 (save-excursion
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1005 (goto-char (window-start window))
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1006 (vertical-motion (1- (window-height window)) window)
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1007 (point))") */
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1008
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1009 DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1010 doc: /* Return position at which display currently ends in WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1011 This is updated by redisplay, when it runs to completion.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1012 Simply changing the buffer text or setting `window-start'
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1013 does not update this value.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1014 Return nil if there is no recorded value. \(This can happen if the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1015 last redisplay of WINDOW was preempted, and did not finish.)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1016 If UPDATE is non-nil, compute the up-to-date position
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1017 if it isn't already recorded. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1018 (window, update)
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1019 Lisp_Object window, update;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021 Lisp_Object value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1022 struct window *w = decode_window (window);
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1023 Lisp_Object buf;
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1024
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1025 buf = w->buffer;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1026 CHECK_BUFFER (buf);
4292
990f6ee7f527 (Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents: 4145
diff changeset
1027
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1028 #if 0 /* This change broke some things. We should make it later. */
8492
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1029 /* If we don't know the end position, return nil.
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1030 The user can compute it with vertical-motion if he wants to.
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1031 It would be nicer to do it automatically,
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1032 but that's so slow that it would probably bother people. */
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1033 if (NILP (w->window_end_valid))
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1034 return Qnil;
8508
6d2f0901efe9 (Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8492
diff changeset
1035 #endif
8492
865daa7a9faf (Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents: 8486
diff changeset
1036
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1037 if (! NILP (update)
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1038 && ! (! NILP (w->window_end_valid)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1039 && XFASTINT (w->last_modified) >= MODIFF)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1040 && !noninteractive)
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1041 {
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1042 struct text_pos startp;
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1043 struct it it;
36231
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1044 struct buffer *old_buffer = NULL, *b = XBUFFER (buf);
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1045
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1046 /* In case W->start is out of the range, use something
46271
35153dd59211 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 46108
diff changeset
1047 reasonable. This situation occurred when loading a file with
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1048 `-l' containing a call to `rmail' with subsequent other
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1049 commands. At the end, W->start happened to be BEG, while
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1050 rmail had already narrowed the buffer. */
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1051 if (XMARKER (w->start)->charpos < BEGV)
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1052 SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1053 else if (XMARKER (w->start)->charpos > ZV)
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1054 SET_TEXT_POS (startp, ZV, ZV_BYTE);
26635
af8d605cbcf1 (Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
1055 else
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1056 SET_TEXT_POS_FROM_MARKER (startp, w->start);
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1057
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1058 /* Cannot use Fvertical_motion because that function doesn't
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1059 cope with variable-height lines. */
36231
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1060 if (b != current_buffer)
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1061 {
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1062 old_buffer = current_buffer;
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1063 set_buffer_internal (b);
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1064 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1065
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1066 start_display (&it, w, startp);
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1067 move_it_vertically (&it, window_box_height (w));
36471
bd660efb3fe7 (Fwindow_end): Call move_it_past_eol only if
Gerd Moellmann <gerd@gnu.org>
parents: 36444
diff changeset
1068 if (it.current_y < it.last_visible_y)
bd660efb3fe7 (Fwindow_end): Call move_it_past_eol only if
Gerd Moellmann <gerd@gnu.org>
parents: 36444
diff changeset
1069 move_it_past_eol (&it);
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1070 value = make_number (IT_CHARPOS (it));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1071
36231
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1072 if (old_buffer)
9fa7c8e6a6d5 (Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents: 36202
diff changeset
1073 set_buffer_internal (old_buffer);
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1074 }
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
1075 else
30743
51d0f4273e89 (Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents: 30560
diff changeset
1076 XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078 return value;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1080
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1082 doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1083 Return POS. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1084 (window, pos)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 Lisp_Object window, pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1089 CHECK_NUMBER_COERCE_MARKER (pos);
24230
ee835eec7607 (Fset_window_point): If WINDOW is selected but the
Richard M. Stallman <rms@gnu.org>
parents: 23728
diff changeset
1090 if (w == XWINDOW (selected_window)
ee835eec7607 (Fset_window_point): If WINDOW is selected but the
Richard M. Stallman <rms@gnu.org>
parents: 23728
diff changeset
1091 && XBUFFER (w->buffer) == current_buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 Fgoto_char (pos);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 set_marker_restricted (w->pointm, pos, w->buffer);
34491
f9d400d4653a (Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents: 34417
diff changeset
1095
34615
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1096 /* We have to make sure that redisplay updates the window to show
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1097 the new value of point. */
a8944d7e6773 (Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 34499
diff changeset
1098 if (!EQ (window, selected_window))
34491
f9d400d4653a (Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents: 34417
diff changeset
1099 ++windows_or_buffers_changed;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1100
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 return pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1103
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1104 DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1105 doc: /* Make display in WINDOW start at position POS in WINDOW's buffer.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1106 Return POS.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1107 Optional third arg NOFORCE non-nil inhibits next redisplay
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1108 from overriding motion of point in order to display at this exact start. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1109 (window, pos, noforce)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 Lisp_Object window, pos, noforce;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1114 CHECK_NUMBER_COERCE_MARKER (pos);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1115 set_marker_restricted (w->start, pos, w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116 /* this is not right, but much easier than doing what is right. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 w->start_at_line_beg = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1118 if (NILP (noforce))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1119 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1120 w->update_mode_line = Qt;
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
1121 XSETFASTINT (w->last_modified, 0);
16208
e3a834653117 (Fset_window_start): Clear last_overlay_modified field.
Richard M. Stallman <rms@gnu.org>
parents: 16068
diff changeset
1122 XSETFASTINT (w->last_overlay_modified, 0);
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1123 if (!EQ (window, selected_window))
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1124 windows_or_buffers_changed++;
25387
df0083768b79 (Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents: 25375
diff changeset
1125
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1126 return pos;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1127 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1128
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1129 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1130 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1131 doc: /* Return WINDOW's dedicated object, usually t or nil.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1132 See also `set-window-dedicated-p'. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1133 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1134 Lisp_Object 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 return decode_window (window)->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1137 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1138
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1139 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p,
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
1140 Sset_window_dedicated_p, 2, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1141 doc: /* Control whether WINDOW is dedicated to the buffer it displays.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1142 If it is dedicated, Emacs will not automatically change
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1143 which buffer appears in it.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1144 The second argument is the new value for the dedication flag;
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1145 non-nil means yes. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1146 (window, arg)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1147 Lisp_Object window, arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1149 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1151 w->dedicated = arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1153 return w->dedicated;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1154 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1156 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1158 doc: /* Return the display-table that WINDOW is using. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1159 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1161 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 return decode_window (window)->display_table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1163 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1164
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1165 /* Get the display table for use on window W. This is either W's
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1166 display table or W's buffer's display table. Ignore the specified
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1167 tables if they are not valid; if no valid table is specified,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1168 return 0. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1169
13187
1a4cee562d33 (window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents: 13126
diff changeset
1170 struct Lisp_Char_Table *
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1171 window_display_table (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1172 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173 {
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1174 struct Lisp_Char_Table *dp = NULL;
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1175
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1176 if (DISP_TABLE_P (w->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1177 dp = XCHAR_TABLE (w->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1178 else if (BUFFERP (w->buffer))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1179 {
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1180 struct buffer *b = XBUFFER (w->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1181
30446
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1182 if (DISP_TABLE_P (b->display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1183 dp = XCHAR_TABLE (b->display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1184 else if (DISP_TABLE_P (Vstandard_display_table))
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1185 dp = XCHAR_TABLE (Vstandard_display_table);
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1186 }
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1187
e3fe041c4e25 (window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents: 30366
diff changeset
1188 return dp;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1190
555
e09a318cf838 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 548
diff changeset
1191 DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_display_table, 2, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1192 doc: /* Set WINDOW's display-table to TABLE. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1193 (window, table)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1194 register Lisp_Object window, table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1195 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1198 w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 w->display_table = table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 return table;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 /* Record info on buffer window w is displaying
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204 when it is about to cease to display that buffer. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1205 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206 unshow_buffer (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1208 {
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1209 Lisp_Object buf;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1210 struct buffer *b;
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1211
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
1212 buf = w->buffer;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1213 b = XBUFFER (buf);
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1214 if (b != XMARKER (w->pointm)->buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1215 abort ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216
5990
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1217 #if 0
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218 if (w == XWINDOW (selected_window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 || ! EQ (buf, XWINDOW (selected_window)->buffer))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1220 /* Do this except when the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221 is being removed from some other window. */
5990
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1222 #endif
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1223 /* last_window_start records the start position that this buffer
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1224 had in the last window to be disconnected from it.
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1225 Now that this statement is unconditional,
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1226 it is possible for the buffer to be displayed in the
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1227 selected window, while last_window_start reflects another
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1228 window which was recently showing the same buffer.
936d4a988148 (unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents: 5988
diff changeset
1229 Some people might say that might be a good thing. Let's see. */
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1230 b->last_window_start = marker_position (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 /* Point in the selected window's buffer
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233 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
1234 So don't clobber point in that buffer. */
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
1235 if (! EQ (buf, XWINDOW (selected_window)->buffer)
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
1236 /* This line helps to fix Horsley's testbug.el bug. */
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1237 && !(WINDOWP (b->last_selected_window)
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1238 && w != XWINDOW (b->last_selected_window)
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
1239 && EQ (buf, XWINDOW (b->last_selected_window)->buffer)))
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1240 temp_set_point_both (b,
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1241 clip_to_bounds (BUF_BEGV (b),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1242 XMARKER (w->pointm)->charpos,
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1243 BUF_ZV (b)),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1244 clip_to_bounds (BUF_BEGV_BYTE (b),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1245 marker_byte_position (w->pointm),
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
1246 BUF_ZV_BYTE (b)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1247
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1248 if (WINDOWP (b->last_selected_window)
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28104
diff changeset
1249 && w == XWINDOW (b->last_selected_window))
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
1250 b->last_selected_window = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1253 /* Put replacement into the window structure in place of old. */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
1254 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1255 replace_window (old, replacement)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1256 Lisp_Object old, replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1257 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1260
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1261 /* 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
1262 root_window for that frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1263
1525
f79a22ad87d0 * window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents: 1444
diff changeset
1264 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame))))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1265 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1266
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1267 p->left_col = o->left_col;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1268 p->top_line = o->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1269 p->total_cols = o->total_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1270 p->total_lines = o->total_lines;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1271 p->desired_matrix = p->current_matrix = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1272 p->vscroll = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1273 bzero (&p->cursor, sizeof (p->cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1274 bzero (&p->last_cursor, sizeof (p->last_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1275 bzero (&p->phys_cursor, sizeof (p->phys_cursor));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1276 p->phys_cursor_type = -1;
43620
8a5d6239662c (make_window, replace_window): Initialize phys_cursor_width.
Kim F. Storm <storm@cua.dk>
parents: 43597
diff changeset
1277 p->phys_cursor_width = -1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1278 p->must_be_updated_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1279 p->pseudo_window_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1280 XSETFASTINT (p->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1281 XSETFASTINT (p->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1282 p->window_end_valid = Qnil;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
1283 p->frozen_window_start_p = 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1284 p->orig_top_line = p->orig_total_lines = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286 p->next = tem = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1287 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1288 XWINDOW (tem)->prev = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1289
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1290 p->prev = tem = o->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1291 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1292 XWINDOW (tem)->next = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1293
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 p->parent = tem = o->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1295 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1296 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1297 if (EQ (XWINDOW (tem)->vchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1298 XWINDOW (tem)->vchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1299 if (EQ (XWINDOW (tem)->hchild, old))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1300 XWINDOW (tem)->hchild = replacement;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1301 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1303 /*** Here, if replacement is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1304 and so is its new parent, we should make replacement's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 children be children of that parent instead. ***/
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1309 doc: /* Remove WINDOW from the display. Default is selected window. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1310 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1311 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1312 {
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1313 delete_window (window);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1314
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1315 if (! NILP (Vwindow_configuration_change_hook)
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1316 && ! NILP (Vrun_hooks))
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1317 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1318
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1319 return Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1320 }
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1321
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
1322 void
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1323 delete_window (window)
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1324 register Lisp_Object window;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
1325 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1326 register Lisp_Object tem, parent, sib;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1327 register struct window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 register struct window *par;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1329 struct frame *f;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1330
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1331 /* Because this function is called by other C code on non-leaf
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1332 windows, the CHECK_LIVE_WINDOW macro would choke inappropriately,
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1333 so we can't decode_window here. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1334 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1337 CHECK_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338 p = XWINDOW (window);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1339
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1340 /* It's a no-op to delete an already-deleted window. */
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1341 if (NILP (p->buffer)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1342 && NILP (p->hchild)
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1343 && NILP (p->vchild))
17365
fc2ec9ced22f (delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents: 17281
diff changeset
1344 return;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1345
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1346 parent = p->parent;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1347 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1348 error ("Attempt to delete minibuffer or sole ordinary window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1349 par = XWINDOW (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1350
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 windows_or_buffers_changed++;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1352 Vwindow_list = Qnil;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1353 f = XFRAME (WINDOW_FRAME (p));
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1354 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1355
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1356 /* Are we trying to delete any frame's selected window? */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1357 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1358 Lisp_Object swindow, pwindow;
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1359
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1360 /* See if the frame's selected window is either WINDOW
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1361 or any subwindow of it, by finding all that window's parents
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1362 and comparing each one with WINDOW. */
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1363 swindow = FRAME_SELECTED_WINDOW (f);
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1364
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1365 while (1)
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1366 {
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1367 pwindow = swindow;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1368 while (!NILP (pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1369 {
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1370 if (EQ (window, pwindow))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1371 break;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1372 pwindow = XWINDOW (pwindow)->parent;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1373 }
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1374
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1375 /* If the window being deleted is not a parent of SWINDOW,
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1376 then SWINDOW is ok as the new selected window. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1377 if (!EQ (window, pwindow))
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1378 break;
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1379 /* Otherwise, try another window for SWINDOW. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1380 swindow = Fnext_window (swindow, Qlambda, Qnil);;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1381
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1382 /* If we get back to the frame's selected window,
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1383 it means there was no acceptable alternative,
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1384 so we cannot delete. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1385 if (EQ (swindow, FRAME_SELECTED_WINDOW (f)))
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1386 error ("Cannot delete window");
3723
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1387 }
ccb9c93aac80 (Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents: 3688
diff changeset
1388
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1389 /* If we need to change SWINDOW, do it. */
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1390 if (! EQ (swindow, FRAME_SELECTED_WINDOW (f)))
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1391 {
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1392 /* If we're about to delete the selected window on the
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1393 selected frame, then we should use Fselect_window to select
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1394 the new window. On the other hand, if we're about to
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1395 delete the selected window on any other frame, we shouldn't do
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1396 anything but set the frame's selected_window slot. */
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1397 if (EQ (FRAME_SELECTED_WINDOW (f), selected_window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1398 Fselect_window (swindow, Qnil);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1399 else
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
1400 FRAME_SELECTED_WINDOW (f) = swindow;
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1401 }
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1402 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1404 /* Now we know we can delete this one. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1405 window_deletion_count++;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1406
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1407 tem = p->buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 /* tem is null for dummy parent windows
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1409 (which have inferiors but not any contents themselves) */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1410 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1412 unshow_buffer (p);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1413 unchain_marker (XMARKER (p->pointm));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1414 unchain_marker (XMARKER (p->start));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1415 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1416
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1417 /* Free window glyph matrices. It is sure that they are allocated
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1418 again when ADJUST_GLYPHS is called. Block input so that expose
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1419 events and other events that access glyph matrices are not
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1420 processed while we are changing them. */
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1421 BLOCK_INPUT;
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1422 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1423
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 tem = p->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1425 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1426 XWINDOW (tem)->prev = p->prev;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 tem = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1429 if (!NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430 XWINDOW (tem)->next = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432 if (EQ (window, par->hchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 par->hchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1434 if (EQ (window, par->vchild))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1435 par->vchild = p->next;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1436
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 /* Find one of our siblings to give our space to. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438 sib = p->prev;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1439 if (NILP (sib))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1440 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1441 /* If p gives its space to its next sibling, that sibling needs
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 to have its top/left side pulled back to where p's is.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 set_window_{height,width} will re-position the sibling's
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 children. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 sib = p->next;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1446 XWINDOW (sib)->top_line = p->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1447 XWINDOW (sib)->left_col = p->left_col;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450 /* Stretch that sibling. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1451 if (!NILP (par->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452 set_window_height (sib,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1453 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1454 1);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1455 if (!NILP (par->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456 set_window_width (sib,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1457 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols),
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458 1);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 /* If parent now has only one child,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461 put the child into the parent's place. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1462 tem = par->hchild;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
1463 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1464 tem = par->vchild;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1465 if (NILP (XWINDOW (tem)->next)) {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1466 replace_window (parent, tem);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1467 par = XWINDOW (tem);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1468 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1469
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1470 /* Since we may be deleting combination windows, we must make sure that
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1471 not only p but all its children have been marked as deleted. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1472 if (! NILP (p->hchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1473 delete_all_subwindows (XWINDOW (p->hchild));
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1474 else if (! NILP (p->vchild))
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1475 delete_all_subwindows (XWINDOW (p->vchild));
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1476
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1477 /* Mark this window as deleted. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
1478 p->buffer = p->hchild = p->vchild = Qnil;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1479
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1480 if (! NILP (par->parent))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1481 par = XWINDOW (par->parent);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1482
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1483 /* Check if we have a v/hchild with a v/hchild. In that case remove
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1484 one of them. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1485
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1486 if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1487 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1488 p = XWINDOW (par->vchild);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1489 par->vchild = p->vchild;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1490 tem = p->vchild;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1491 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1492 else if (! NILP (par->hchild) && ! NILP (XWINDOW (par->hchild)->hchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1493 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1494 p = XWINDOW (par->hchild);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1495 par->hchild = p->hchild;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1496 tem = p->hchild;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1497 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1498 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1499 p = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1500
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1501 if (p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1502 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1503 while (! NILP (tem)) {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1504 XWINDOW (tem)->parent = p->parent;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1505 if (NILP (XWINDOW (tem)->next))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1506 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1507 tem = XWINDOW (tem)->next;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1508 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1509 if (! NILP (tem)) {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1510 /* The next of the v/hchild we are removing is now the next of the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1511 last child for the v/hchild:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1512 Before v/hchild -> v/hchild -> next1 -> next2
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1513 |
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1514 -> next3
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1515 After: v/hchild -> next1 -> next2 -> next3
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1516 */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1517 XWINDOW (tem)->next = p->next;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1518 if (! NILP (p->next))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1519 XWINDOW (p->next)->prev = tem;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1520 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1521 p->next = p->prev = p->vchild = p->hchild = p->buffer = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1522 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1523
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1524
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
1525 /* Adjust glyph matrices. */
34819
7fcb09b535b4 (delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents: 34786
diff changeset
1526 adjust_glyphs (f);
26761
c15c2756ec0f (delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents: 26635
diff changeset
1527 UNBLOCK_INPUT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1529
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1530
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1532 /***********************************************************************
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1533 Window List
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1534 ***********************************************************************/
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1535
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1536 /* Add window W to *USER_DATA. USER_DATA is actually a Lisp_Object
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1537 pointer. This is a callback function for foreach_window, used in
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1538 function window_list. */
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1539
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1540 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1541 add_window_to_list (w, user_data)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1542 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1543 void *user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1544 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
1545 Lisp_Object *list = (Lisp_Object *) user_data;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1546 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1547 XSETWINDOW (window, w);
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1548 *list = Fcons (window, *list);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1549 return 1;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1550 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1551
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1552
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1553 /* Return a list of all windows, for use by next_window. If
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1554 Vwindow_list is a list, return that list. Otherwise, build a new
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1555 list, cache it in Vwindow_list, and return that. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1556
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1557 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1558 window_list ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1559 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1560 if (!CONSP (Vwindow_list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1561 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1562 Lisp_Object tail;
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1563
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1564 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1565 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1566 {
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1567 Lisp_Object args[2];
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1568
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1569 /* We are visiting windows in canonical order, and add
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1570 new windows at the front of args[1], which means we
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1571 have to reverse this list at the end. */
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1572 args[1] = Qnil;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1573 foreach_window (XFRAME (XCAR (tail)), add_window_to_list, &args[1]);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1574 args[0] = Vwindow_list;
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1575 args[1] = Fnreverse (args[1]);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1576 Vwindow_list = Fnconc (2, args);
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1577 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1578 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1579
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1580 return Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1581 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1582
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1583
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1584 /* Value is non-zero if WINDOW satisfies the constraints given by
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1585 OWINDOW, MINIBUF and ALL_FRAMES.
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1586
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1587 MINIBUF t means WINDOW may be minibuffer windows.
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1588 `lambda' means WINDOW may not be a minibuffer window.
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1589 a window means a specific minibuffer window
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1590
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1591 ALL_FRAMES t means search all frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1592 nil means search just current frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1593 `visible' means search just visible frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1594 0 means search visible and iconified frames,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1595 a window means search the frame that window belongs to,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1596 a frame means consider windows on that frame, only. */
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1597
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1598 static int
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1599 candidate_window_p (window, owindow, minibuf, all_frames)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1600 Lisp_Object window, owindow, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1601 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1602 struct window *w = XWINDOW (window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1603 struct frame *f = XFRAME (w->frame);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1604 int candidate_p = 1;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1605
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1606 if (!BUFFERP (w->buffer))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1607 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1608 else if (MINI_WINDOW_P (w)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1609 && (EQ (minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1610 || (WINDOWP (minibuf) && !EQ (minibuf, window))))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1611 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1612 /* If MINIBUF is `lambda' don't consider any mini-windows.
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1613 If it is a window, consider only that one. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1614 candidate_p = 0;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1615 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1616 else if (EQ (all_frames, Qt))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1617 candidate_p = 1;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1618 else if (NILP (all_frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1619 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1620 xassert (WINDOWP (owindow));
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1621 candidate_p = EQ (w->frame, XWINDOW (owindow)->frame);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1622 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1623 else if (EQ (all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1624 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1625 FRAME_SAMPLE_VISIBILITY (f);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1626 candidate_p = FRAME_VISIBLE_P (f);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1627 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1628 else if (INTEGERP (all_frames) && XINT (all_frames) == 0)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1629 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1630 FRAME_SAMPLE_VISIBILITY (f);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1631 candidate_p = FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1632 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1633 else if (WINDOWP (all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1634 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1635 || EQ (XWINDOW (all_frames)->frame, w->frame)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1636 || EQ (XWINDOW (all_frames)->frame, FRAME_FOCUS_FRAME (f)));
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1637 else if (FRAMEP (all_frames))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1638 candidate_p = EQ (all_frames, w->frame);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1639
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1640 return candidate_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1641 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1642
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1643
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1644 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1645 Fwindow_list. See there for the meaning of WINDOW, MINIBUF, and
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1646 ALL_FRAMES. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1647
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1648 static void
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1649 decode_next_window_args (window, minibuf, all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1650 Lisp_Object *window, *minibuf, *all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1651 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1652 if (NILP (*window))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1653 *window = selected_window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1654 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1655 CHECK_LIVE_WINDOW (*window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1656
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1657 /* MINIBUF nil may or may not include minibuffers. Decide if it
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1658 does. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1659 if (NILP (*minibuf))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1660 *minibuf = minibuf_level ? minibuf_window : Qlambda;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1661 else if (!EQ (*minibuf, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1662 *minibuf = Qlambda;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1663
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1664 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda'
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1665 => count none of them, or a specific minibuffer window (the
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1666 active one) to count. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1667
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1668 /* ALL_FRAMES nil doesn't specify which frames to include. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1669 if (NILP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1670 *all_frames = (!EQ (*minibuf, Qlambda)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1671 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1672 : Qnil);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1673 else if (EQ (*all_frames, Qvisible))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1674 ;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1675 else if (EQ (*all_frames, make_number (0)))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1676 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1677 else if (FRAMEP (*all_frames))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1678 ;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1679 else if (!EQ (*all_frames, Qt))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1680 *all_frames = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1681
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1682 /* Now *ALL_FRAMES is t meaning search all frames, nil meaning
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1683 search just current frame, `visible' meaning search just visible
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1684 frames, 0 meaning search visible and iconified frames, or a
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1685 window, meaning search the frame that window belongs to, or a
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1686 frame, meaning consider windows on that frame, only. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1687 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1688
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1689
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1690 /* Return the next or previous window of WINDOW in canonical ordering
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1691 of windows. NEXT_P non-zero means return the next window. See the
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1692 documentation string of next-window for the meaning of MINIBUF and
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1693 ALL_FRAMES. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1694
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1695 static Lisp_Object
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1696 next_window (window, minibuf, all_frames, next_p)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1697 Lisp_Object window, minibuf, all_frames;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1698 int next_p;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1699 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1700 decode_next_window_args (&window, &minibuf, &all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1701
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1702 /* If ALL_FRAMES is a frame, and WINDOW isn't on that frame, just
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1703 return the first window on the frame. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1704 if (FRAMEP (all_frames)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1705 && !EQ (all_frames, XWINDOW (window)->frame))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1706 return Fframe_first_window (all_frames);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1707
30039
07f23448b6e5 (add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents: 30037
diff changeset
1708 if (next_p)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1709 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1710 Lisp_Object list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1711
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1712 /* Find WINDOW in the list of all windows. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1713 list = Fmemq (window, window_list ());
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1714
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1715 /* Scan forward from WINDOW to the end of the window list. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1716 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1717 for (list = XCDR (list); CONSP (list); list = XCDR (list))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1718 if (candidate_window_p (XCAR (list), window, minibuf, all_frames))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1719 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1720
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1721 /* Scan from the start of the window list up to WINDOW. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1722 if (!CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1723 for (list = Vwindow_list;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1724 CONSP (list) && !EQ (XCAR (list), window);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1725 list = XCDR (list))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1726 if (candidate_window_p (XCAR (list), window, minibuf, all_frames))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1727 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1728
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1729 if (CONSP (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1730 window = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1731 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1732 else
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1733 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1734 Lisp_Object candidate, list;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1735
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1736 /* Scan through the list of windows for candidates. If there are
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1737 candidate windows in front of WINDOW, the last one of these
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1738 is the one we want. If there are candidates following WINDOW
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1739 in the list, again the last one of these is the one we want. */
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1740 candidate = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1741 for (list = window_list (); CONSP (list); list = XCDR (list))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1742 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1743 if (EQ (XCAR (list), window))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1744 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1745 if (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1746 break;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1747 }
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1748 else if (candidate_window_p (XCAR (list), window, minibuf,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1749 all_frames))
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1750 candidate = XCAR (list);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1751 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1752
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1753 if (WINDOWP (candidate))
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1754 window = candidate;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1755 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1756
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1757 return window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1758 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1759
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
1760
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
1761 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1762 doc: /* Return next window after WINDOW in canonical ordering of windows.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1763 If omitted, WINDOW defaults to the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1764
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1765 Optional second arg MINIBUF t means count the minibuffer window even
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1766 if not active. MINIBUF nil or omitted means count the minibuffer iff
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1767 it is active. MINIBUF neither t nor nil means not to count the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1768 minibuffer even if it is active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1769
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1770 Several frames may share a single minibuffer; if the minibuffer
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1771 counts, all windows on all frames that share that minibuffer count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1772 too. Therefore, `next-window' can be used to iterate through the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1773 set of windows even when the minibuffer is on another frame. If the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1774 minibuffer does not count, only windows from WINDOW's frame count.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1775
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1776 Optional third arg ALL-FRAMES t means include windows on all frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1777 ALL-FRAMES nil or omitted means cycle within the frames as specified
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1778 above. ALL-FRAMES = `visible' means include windows on all visible frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1779 ALL-FRAMES = 0 means include windows on all visible and iconified frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1780 If ALL-FRAMES is a frame, restrict search to windows on that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1781 Anything else means restrict to WINDOW's frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1782
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1783 If you use consistent values for MINIBUF and ALL-FRAMES, you can use
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1784 `next-window' to iterate through the entire cycle of acceptable
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1785 windows, eventually ending up back at the window you started with.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1786 `previous-window' traverses the same cycle, in the reverse order. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1787 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1788 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1789 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1790 return next_window (window, minibuf, all_frames, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1791 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1792
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1793
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
1794 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1795 doc: /* Return the window preceding WINDOW in canonical ordering of windows.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1796 If omitted, WINDOW defaults to the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1797
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1798 Optional second arg MINIBUF t means count the minibuffer window even
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1799 if not active. MINIBUF nil or omitted means count the minibuffer iff
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1800 it is active. MINIBUF neither t nor nil means not to count the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1801 minibuffer even if it is active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1802
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1803 Several frames may share a single minibuffer; if the minibuffer
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1804 counts, all windows on all frames that share that minibuffer count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1805 too. Therefore, `previous-window' can be used to iterate through
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1806 the set of windows even when the minibuffer is on another frame. If
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1807 the minibuffer does not count, only windows from WINDOW's frame count
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1808
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1809 Optional third arg ALL-FRAMES t means include windows on all frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1810 ALL-FRAMES nil or omitted means cycle within the frames as specified
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1811 above. ALL-FRAMES = `visible' means include windows on all visible frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1812 ALL-FRAMES = 0 means include windows on all visible and iconified frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1813 If ALL-FRAMES is a frame, restrict search to windows on that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1814 Anything else means restrict to WINDOW's frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1815
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1816 If you use consistent values for MINIBUF and ALL-FRAMES, you can use
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1817 `previous-window' to iterate through the entire cycle of acceptable
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1818 windows, eventually ending up back at the window you started with.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1819 `next-window' traverses the same cycle, in the reverse order. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1820 (window, minibuf, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1821 Lisp_Object window, minibuf, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1823 return next_window (window, minibuf, all_frames, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1824 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1826
338
4840aae6a876 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 265
diff changeset
1827 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1828 doc: /* Select the ARG'th different window on this frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1829 All windows on current frame are arranged in a cyclic order.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1830 This command selects the window ARG steps away in that order.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1831 A negative ARG moves in the opposite order. The optional second
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1832 argument ALL_FRAMES has the same meaning as in `next-window', which see. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1833 (arg, all_frames)
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1834 Lisp_Object arg, all_frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1836 Lisp_Object window;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1837 int i;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
1839 CHECK_NUMBER (arg);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1840 window = selected_window;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1841
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1842 for (i = XINT (arg); i > 0; --i)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1843 window = Fnext_window (window, Qnil, all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1844 for (; i < 0; ++i)
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1845 window = Fprevious_window (window, Qnil, all_frames);
39953
3a1666ed16b8 (select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents: 39952
diff changeset
1846
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1847 Fselect_window (window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1850
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1851
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1852 DEFUN ("window-list", Fwindow_list, Swindow_list, 0, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1853 doc: /* Return a list of windows on FRAME, starting with WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1854 FRAME nil or omitted means use the selected frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1855 WINDOW nil or omitted means use the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1856 MINIBUF t means include the minibuffer window, even if it isn't active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1857 MINIBUF nil or omitted means include the minibuffer window only
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1858 if it's active.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1859 MINIBUF neither nil nor t means never include the minibuffer window. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
1860 (frame, minibuf, window)
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1861 Lisp_Object frame, minibuf, window;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1862 {
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1863 if (NILP (window))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1864 window = selected_window;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1865 if (NILP (frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1866 frame = selected_frame;
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1867
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1868 if (!EQ (frame, XWINDOW (window)->frame))
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1869 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
1870
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1871 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
1872 }
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1873
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1874
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1875 /* Return a list of windows in canonical ordering. Arguments are like
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1876 for `next-window'. */
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1877
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1878 static Lisp_Object
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1879 window_list_1 (window, minibuf, all_frames)
30265
9b1c8eafe4dc (Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents: 30102
diff changeset
1880 Lisp_Object window, minibuf, all_frames;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1881 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1882 Lisp_Object tail, list, rest;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1883
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1884 decode_next_window_args (&window, &minibuf, &all_frames);
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1885 list = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1886
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1887 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
1888 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
1889 list = Fcons (XCAR (tail), list);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1890
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1891 /* Rotate the list to start with WINDOW. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1892 list = Fnreverse (list);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1893 rest = Fmemq (window, list);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1894 if (!NILP (rest) && !EQ (rest, list))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1895 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1896 for (tail = list; !EQ (XCDR (tail), rest); tail = XCDR (tail))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1897 ;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1898 XSETCDR (tail, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1899 list = nconc2 (rest, list);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1900 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1901 return list;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1902 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1903
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
1904
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1905
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1906 /* Look at all windows, performing an operation specified by TYPE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907 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
1908 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
1909 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
1910 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
1911 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
1912 If MINI is non-zero, perform the operation on minibuffer windows too. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914 enum window_loop
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1915 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 WINDOW_LOOP_UNUSED,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1917 GET_BUFFER_WINDOW, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1918 GET_LRU_WINDOW, /* Arg is t for full-width windows only */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1920 DELETE_BUFFER_WINDOWS, /* Arg is buffer */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1921 GET_LARGEST_WINDOW,
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
1922 UNSHOW_BUFFER, /* Arg is buffer */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1923 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
1924 CHECK_ALL_WINDOWS
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1925 };
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1926
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 static Lisp_Object
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1928 window_loop (type, obj, mini, frames)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1929 enum window_loop type;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1930 Lisp_Object obj, frames;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1931 int mini;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1932 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1933 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
1934 struct frame *f;
30102
9406cb07bac7 (window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30093
diff changeset
1935 struct gcpro gcpro1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1936
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1937 /* If we're only looping through windows on a particular frame,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1938 frame points to that frame. If we're looping through windows
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1939 on all frames, frame is 0. */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1940 if (FRAMEP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1941 f = XFRAME (frames);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
1942 else if (NILP (frames))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1943 f = SELECTED_FRAME ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1944 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1945 f = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1946
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1947 if (f)
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1948 frame_arg = Qlambda;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1949 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
1950 frame_arg = frames;
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1951 else if (EQ (frames, Qvisible))
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1952 frame_arg = frames;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1953 else
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1954 frame_arg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955
6247
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1956 /* 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
1957 Qvisible to consider all visible frames,
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1958 or Qt otherwise. */
22d4037cbce2 (Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents: 6242
diff changeset
1959
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 /* 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
1961 if (WINDOWP (obj))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1962 window = obj;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1963 else if (f)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1964 window = FRAME_SELECTED_WINDOW (f);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1966 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
1967
33619
d0482eab29e1 (Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents: 33463
diff changeset
1968 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
1969 GCPRO1 (windows);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1970 best_window = Qnil;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1971
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
1972 for (; CONSP (windows); windows = XCDR (windows))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1973 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1974 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1975
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1976 window = XCAR (windows);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1977 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
1978
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1979 /* 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
1980 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
1981 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
1982 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
1983 /* 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
1984 || type == UNSHOW_BUFFER
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1985 || (mini && minibuf_level > 0))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1986 switch (type)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1987 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1988 case GET_BUFFER_WINDOW:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1989 if (EQ (w->buffer, obj)
16522
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
1990 /* Don't find any minibuffer window
63ca7c6ceeff (window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
1991 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
1992 && (MINI_WINDOW_P (w)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1993 ? EQ (window, minibuf_window)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1994 : 1))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
1995 {
36068
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
1996 if (NILP (best_window))
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
1997 best_window = window;
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
1998 else if (EQ (window, selected_window))
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
1999 /* For compatibility with 20.x, prefer to return
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2000 selected-window. */
acd9eaaa94c1 (window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents: 35891
diff changeset
2001 best_window = window;
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2002 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 case GET_LRU_WINDOW:
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2006 /* `obj' is an integer encoding a bitvector.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2007 `obj & 1' means consider only full-width windows.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2008 `obj & 2' means consider also dedicated windows. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2009 if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2010 || (!(XINT (obj) & 2) && EQ (w->dedicated, Qt))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2011 /* Minibuffer windows are always ignored. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2012 || MINI_WINDOW_P (w))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 break;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2014 if (NILP (best_window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2015 || (XFASTINT (XWINDOW (best_window)->use_time)
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2016 > XFASTINT (w->use_time)))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2017 best_window = window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2018 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2019
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 case DELETE_OTHER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2021 if (!EQ (window, obj))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2022 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2024
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 case DELETE_BUFFER_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2026 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2027 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2028 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
2029
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2030 /* 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
2031 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2032 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2033 && !NILP (w->dedicated)
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2034 && other_visible_frames (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2035 {
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2036 /* 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
2037 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2038 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2039 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2040 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2041 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2042
10808
64fcde7a1438 (window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents: 10666
diff changeset
2043 /* Now we can safely delete the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2044 Fdelete_frame (w->frame, Qnil);
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2045 }
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2046 else if (NILP (w->parent))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2047 {
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2048 /* 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
2049 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
2050 display there. */
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2051 Lisp_Object buffer;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2052 buffer = Fother_buffer (obj, Qnil, w->frame);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2053 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2054 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2055 Fset_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2056 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2057 else
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2058 Fdelete_window (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2059 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2060 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2061
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2062 case GET_LARGEST_WINDOW:
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2063 { /* 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
2064 /* Ignore dedicated windows and minibuffers. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2065 if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt)))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2066 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2067
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2068 if (NILP (best_window))
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2069 best_window = window;
31393
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2070 else
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2071 {
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2072 struct window *b = XWINDOW (best_window);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2073 if (XFASTINT (w->total_lines) * XFASTINT (w->total_cols)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2074 > 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
2075 best_window = window;
9cb95a7ee33e (window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents: 31117
diff changeset
2076 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2077 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2078 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2079
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2080 case UNSHOW_BUFFER:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2081 if (EQ (w->buffer, obj))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 {
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2083 Lisp_Object buffer;
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2084 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2085
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2086 /* 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
2087 buffer = Fother_buffer (obj, Qnil, w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2088
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2089 /* 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
2090 kill the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2091 if (EQ (window, FRAME_ROOT_WINDOW (f))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2092 && !NILP (w->dedicated)
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2093 && other_visible_frames (f))
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2094 {
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2095 /* Skip the other windows on this frame.
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2096 There might be one, the minibuffer! */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2097 while (CONSP (XCDR (windows))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2098 && EQ (XWINDOW (XCAR (windows))->frame,
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2099 XWINDOW (XCAR (XCDR (windows)))->frame))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2100 windows = XCDR (windows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2101
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2102 /* Now we can safely delete the frame. */
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2103 Fdelete_frame (w->frame, Qnil);
8536
b97057eb17d3 (window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents: 8508
diff changeset
2104 }
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2105 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
2106 {
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2107 Lisp_Object window;
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2108 XSETWINDOW (window, w);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2109 /* 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
2110 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
2111 Fdelete_window (window);
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
2112 }
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2113 else
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2114 {
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2115 /* 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
2116 w->dedicated = Qnil;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2117 Fset_window_buffer (window, buffer, Qnil);
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2118 if (EQ (window, selected_window))
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2119 Fset_buffer (w->buffer);
7647
d93dff6fbc73 (window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents: 7618
diff changeset
2120 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2122 break;
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2123
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2124 case REDISPLAY_BUFFER_WINDOWS:
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2125 if (EQ (w->buffer, obj))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2126 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2127 mark_window_display_accurate (window, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2128 w->update_mode_line = Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2129 XBUFFER (obj)->prevent_redisplay_optimizations_p = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2130 ++update_mode_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2131 best_window = window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2132 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2133 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2134
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2135 /* 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
2136 case CHECK_ALL_WINDOWS:
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2137 if (! NILP (w->buffer)
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2138 && NILP (XBUFFER (w->buffer)->name))
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2139 abort ();
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2140 break;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2141
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2142 case WINDOW_LOOP_UNUSED:
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
2143 break;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2144 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146
30093
22f8fc642575 (Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents: 30045
diff changeset
2147 UNGCPRO;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2148 return best_window;
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
2149 }
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2150
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2151 /* 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
2152
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2153 void
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2154 check_all_windows ()
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2155 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2156 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
2157 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
2158
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2159 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
2160 doc: /* Return the window least recently selected or used for display.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2161 Return a full-width window if possible.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2162 A minibuffer window is never a candidate.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2163 A dedicated window is never a candidate, unless DEDICATED is non-nil,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2164 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
2165 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
2166 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
2167 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
2168 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
2169 If FRAME is a frame, search only that frame. */)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2170 (frame, dedicated)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2171 Lisp_Object frame, dedicated;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2172 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2173 register Lisp_Object w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2174 /* First try for a window that is full-width */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2175 w = window_loop (GET_LRU_WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2176 NILP (dedicated) ? make_number (1) : make_number (3),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2177 0, frame);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2178 if (!NILP (w) && !EQ (w, selected_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 return w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2180 /* If none of them, try the rest */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2181 return window_loop (GET_LRU_WINDOW,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2182 NILP (dedicated) ? make_number (0) : make_number (2),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2183 0, frame);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2184 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2185
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2186 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
2187 doc: /* Return the largest window in area.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2188 A minibuffer window is never a candidate.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2189 A dedicated window is never a candidate unless DEDICATED is non-nil,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2190 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
2191 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
2192 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
2193 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
2194 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
2195 If FRAME is a frame, search only that frame. */)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2196 (frame, dedicated)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2197 Lisp_Object frame, dedicated;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2198 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2199 return window_loop (GET_LARGEST_WINDOW, dedicated, 0,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2200 frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2201 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2202
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2203 DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2204 doc: /* Return a window currently displaying BUFFER, or nil if none.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2205 BUFFER can be a buffer or a buffer name.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2206 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
2207 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
2208 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
2209 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
2210 If FRAME is a frame, search only that frame. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2211 (buffer, frame)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2212 Lisp_Object buffer, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2213 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2214 buffer = Fget_buffer (buffer);
9105
984a4b1be1d1 (Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents: 9028
diff changeset
2215 if (BUFFERP (buffer))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
2216 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2217 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2218 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2219 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2220
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2221 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
2222 0, 1, "",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2223 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
2224 Only the frame WINDOW is on is affected.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2225 This function tries to reduce display jumps
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2226 by keeping the text previously visible in WINDOW
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2227 in the same place on the frame. Doing this depends on
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2228 the value of (window-start WINDOW), so if calling this function
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2229 in a program gives strange scrolling, make sure the window-start
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2230 value is reasonable when this function is called. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2231 (window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2232 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2233 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2234 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
2235 int startpos;
35038
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2236 int top, new_top;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2238 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2239 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2241 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242 w = XWINDOW (window);
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2243
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2244 startpos = marker_position (w->start);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2245 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
2246
9028
74119e5602eb (Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents: 8991
diff changeset
2247 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
2248 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
2249
2190
482c7827b968 (Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
2250 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2251
7348
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2252 /* 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
2253 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
2254 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
2255 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
2256 not current, due to typeahead). */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2257 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
2258 if (new_top != top
ac8eb6b4eee6 (Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents: 35024
diff changeset
2259 && 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
2260 && 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
2261 {
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2262 struct position pos;
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2263 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
2264
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2265 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
2266 /* 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
2267 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
2268 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
2269
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
2270 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
2271 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
2272 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
2273 || 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
2274 : Qnil);
13198
43d90596da34 (Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents: 13187
diff changeset
2275 /* 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
2276 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
2277 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
2278
99b9c9068761 (Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents: 7347
diff changeset
2279 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
2280 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2281
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2285 DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2286 1, 2, "bDelete windows on (buffer): ",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2287 doc: /* Delete all windows showing BUFFER.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2288 BUFFER must be a buffer or the name of an existing buffer.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2289 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
2290 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
2291 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
2292 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
2293 If FRAME is t, search only the selected frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2294 If FRAME is a frame, search only that frame. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2295 (buffer, frame)
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2296 Lisp_Object buffer, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2297 {
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2298 /* 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
2299 expects. */
22223
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2300 if (NILP (frame))
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2301 frame = Qt;
5d15aed3a37c (Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents: 22187
diff changeset
2302 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
2303 frame = Qnil;
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2304
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2305 if (!NILP (buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2306 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2307 buffer = Fget_buffer (buffer);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2308 CHECK_BUFFER (buffer);
4145
a0b726903a1f * window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents: 3803
diff changeset
2309 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2310 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2311
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2312 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2313 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2314
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2315 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
2316 Sreplace_buffer_in_windows,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2317 1, 1, "bReplace buffer in windows: ",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2318 doc: /* Replace BUFFER with some other buffer in all windows showing it.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2319 BUFFER may be a buffer or the name of an existing buffer. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
2320 (buffer)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 Lisp_Object buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
2323 if (!NILP (buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325 buffer = Fget_buffer (buffer);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
2326 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 window_loop (UNSHOW_BUFFER, buffer, 0, Qt);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2329 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2330 }
13918
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2331
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2332 /* 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
2333 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
2334
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2335 void
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2336 replace_buffer_in_all_windows (buffer)
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2337 Lisp_Object buffer;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2338 {
14204
c0b44d3a8312 (replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
2339 #ifdef MULTI_KBOARD
13918
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2340 Lisp_Object tail, frame;
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2341
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2342 /* 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
2343 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
2344 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
2345 FOR_EACH_FRAME (tail, frame)
20066
affc9c857428 (replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents: 20046
diff changeset
2346 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
2347 #else
20066
affc9c857428 (replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents: 20046
diff changeset
2348 window_loop (UNSHOW_BUFFER, buffer, 1, Qt);
13918
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2349 #endif
2f6eaea659da (replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13780
diff changeset
2350 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2351
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2352 /* 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
2353
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2354 /* 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
2355 might crash Emacs. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2356
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2357 #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
2358 #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
2359
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2360 /* Make sure that window_min_height and window_min_width are
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2361 not too small; if they are, set them to safe minima. */
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2362
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2363 static void
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2364 check_min_window_sizes ()
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2365 {
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2366 /* Smaller values might permit a crash. */
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2367 if (window_min_width < MIN_SAFE_WINDOW_WIDTH)
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2368 window_min_width = MIN_SAFE_WINDOW_WIDTH;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2369 if (window_min_height < MIN_SAFE_WINDOW_HEIGHT)
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2370 window_min_height = MIN_SAFE_WINDOW_HEIGHT;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2371 }
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2372
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2373 /* 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
2374 minimum allowable size. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2375
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2376 void
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2377 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
2378 FRAME_PTR frame;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
2379 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
2380 {
4347
d6b289b1a6dc * window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents: 4292
diff changeset
2381 /* 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
2382 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
2383 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
2384 int min_height
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2385 = ((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
2386 ? MIN_SAFE_WINDOW_HEIGHT
87fe94f01b8e (check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents: 42862
diff changeset
2387 : 2 * MIN_SAFE_WINDOW_HEIGHT);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2388
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2389 if (FRAME_TOP_MARGIN (frame) > 0)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
2390 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
2391
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2392 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
2393 *rows = min_height;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2394 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
2395 *cols = MIN_SAFE_WINDOW_WIDTH;
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2396 }
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
2397
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2398
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2399 /* 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
2400 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
2401 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
2402 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
2403 either. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2404
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2405 static int
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2406 window_fixed_size_p (w, width_p, check_siblings_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2407 struct window *w;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2408 int width_p, check_siblings_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2409 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2410 int fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2411 struct window *c;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2412
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2413 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2414 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2415 c = XWINDOW (w->hchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2416
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2417 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2418 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2419 /* A horiz. combination is fixed-width if all of if its
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2420 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2421 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2422 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2423 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2424 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2425 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2426 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2427 /* A horiz. combination is fixed-height if one of if its
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2428 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2429 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2430 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2431 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2432 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2433 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2434 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2435 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2436 c = XWINDOW (w->vchild);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2437
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2438 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2439 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2440 /* A vert. combination is fixed-width if one of if its
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2441 children is. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2442 while (c && !window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2443 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2444 fixed_p = c != NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2445 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2446 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2447 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2448 /* A vert. combination is fixed-height if all of if its
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2449 children are. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2450 while (c && window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2451 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2452 fixed_p = c == NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2453 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2454 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2455 else if (BUFFERP (w->buffer))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2456 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2457 struct buffer *old = current_buffer;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2458 Lisp_Object val;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2459
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2460 current_buffer = XBUFFER (w->buffer);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2461 val = find_symbol_value (Qwindow_size_fixed);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2462 current_buffer = old;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2463
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2464 fixed_p = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2465 if (!EQ (val, Qunbound))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2466 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2467 fixed_p = !NILP (val);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2468
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2469 if (fixed_p
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2470 && ((EQ (val, Qheight) && width_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2471 || (EQ (val, Qwidth) && !width_p)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2472 fixed_p = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2473 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2474
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2475 /* 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
2476 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
2477 if (!fixed_p && check_siblings_p && WINDOWP (w->parent))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2478 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2479 Lisp_Object child;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2480
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2481 for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2482 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2483 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2484
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2485 if (NILP (child))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2486 for (child = w->next; !NILP (child); child = XWINDOW (child)->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2487 if (!window_fixed_size_p (XWINDOW (child), width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2488 break;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2489
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2490 if (NILP (child))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2491 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2492 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2493 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2494 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2495 fixed_p = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2496
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2497 return fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2498 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2499
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2500
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2501 /* Return the minimum size of window W, not taking fixed-width windows
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2502 into account. WIDTH_P non-zero means return the minimum width,
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2503 otherwise return the minimum height. If W is a combination window,
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2504 compute the minimum size from the minimum sizes of W's children. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2505
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2506 static int
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2507 window_min_size_1 (w, width_p)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2508 struct window *w;
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2509 int width_p;
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2510 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2511 struct window *c;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2512 int size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2513
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2514 if (!NILP (w->hchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2515 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2516 c = XWINDOW (w->hchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2517 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2518
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2519 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2520 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2521 /* The min width of a horizontal combination is
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2522 the sum of the min widths of its children. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2523 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2524 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2525 size += window_min_size_1 (c, width_p);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2526 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2527 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2528 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2529 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2530 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2531 /* The min height a horizontal combination equals
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2532 the maximum of all min height of its children. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2533 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2534 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2535 int min_size = window_min_size_1 (c, width_p);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2536 size = max (min_size, size);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2537 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2538 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2539 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2540 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2541 else if (!NILP (w->vchild))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2542 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2543 c = XWINDOW (w->vchild);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2544 size = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2545
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2546 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2547 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2548 /* The min width of a vertical combination is
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2549 the maximum of the min widths of its children. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2550 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2551 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2552 int min_size = window_min_size_1 (c, width_p);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2553 size = max (min_size, size);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2554 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2555 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2556 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2557 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2558 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2559 /* The min height of a vertical combination equals
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2560 the sum of the min height of its children. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2561 while (c)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2562 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2563 size += window_min_size_1 (c, width_p);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2564 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2565 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2566 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2567 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2568 else
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2569 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2570 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2571 size = window_min_width;
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2572 else
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2573 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2574 if (MINI_WINDOW_P (w)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2575 || (!WINDOW_WANTS_MODELINE_P (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
2576 && !WINDOW_WANTS_HEADER_LINE_P (w)))
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2577 size = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2578 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2579 size = window_min_height;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2580 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2581 }
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2582
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2583 return size;
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2584 }
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2585
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
2586
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2587 /* Return the minimum size of window W, taking fixed-size windows into
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2588 account. WIDTH_P non-zero means return the minimum width,
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2589 otherwise return the minimum height. IGNORE_FIXED_P non-zero means
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2590 ignore if W is fixed-size. Set *FIXED to 1 if W is fixed-size
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2591 unless FIXED is null. */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2592
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2593 static int
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2594 window_min_size (w, width_p, ignore_fixed_p, fixed)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2595 struct window *w;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2596 int width_p, ignore_fixed_p, *fixed;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2597 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2598 int size, fixed_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2599
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2600 if (ignore_fixed_p)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2601 fixed_p = 0;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2602 else
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
2603 fixed_p = window_fixed_size_p (w, width_p, 1);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2604
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2605 if (fixed)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2606 *fixed = fixed_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2607
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2608 if (fixed_p)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2609 size = width_p ? XFASTINT (w->total_cols) : XFASTINT (w->total_lines);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2610 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2611 size = window_min_size_1 (w, width_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2612
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2613 return size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2614 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2615
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2616
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2617 /* Adjust the margins of window W if text area is too small.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2618 Return 1 if window width is ok after adjustment; 0 if window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2619 is still too narrow. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2620
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2621 static int
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2622 adjust_window_margins (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2623 struct window *w;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2624 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2625 int box_cols = (WINDOW_TOTAL_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2626 - WINDOW_FRINGE_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2627 - WINDOW_SCROLL_BAR_COLS (w));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2628 int margin_cols = (WINDOW_LEFT_MARGIN_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2629 + WINDOW_RIGHT_MARGIN_COLS (w));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2630
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2631 if (box_cols - margin_cols >= MIN_SAFE_WINDOW_WIDTH)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2632 return 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2633
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2634 if (margin_cols < 0 || box_cols < MIN_SAFE_WINDOW_WIDTH)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2635 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2636
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2637 /* Window's text area is too narrow, but reducing the window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2638 margins will fix that. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2639 margin_cols = box_cols - MIN_SAFE_WINDOW_WIDTH;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2640 if (WINDOW_RIGHT_MARGIN_COLS (w) > 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2641 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2642 if (WINDOW_LEFT_MARGIN_COLS (w) > 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2643 w->left_margin_cols = w->right_margin_cols
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2644 = make_number (margin_cols/2);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2645 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2646 w->right_margin_cols = make_number (margin_cols);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2647 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2648 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2649 w->left_margin_cols = make_number (margin_cols);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2650 return 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2651 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2652
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2653 /* Calculate new sizes for windows in the list FORWARD when the window size
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2654 goes from TOTAL to SIZE. TOTAL must be greater than SIZE.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2655 The number of windows in FORWARD is NCHILDREN, and the number that
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2656 can shrink is SHRINKABLE.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2657 The minimum size a window can have is MIN_SIZE.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2658 If we are shrinking fixed windows, RESIZE_FIXED_P is non-zero.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2659 If we are shrinking columns, WIDTH_P is non-zero, otherwise we are
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2660 shrinking rows.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2661
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2662 This function returns an allocated array of new sizes that the caller
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2663 must free. The size -1 means the window is fixed and RESIZE_FIXED_P
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2664 is zero. Array index 0 refers to the first window in FORWARD, 1 to
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2665 the second, and so on.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2666
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2667 This function tries to keep windows at least at the minimum size
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2668 and resize other windows before it resizes any window to zero (i.e.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2669 delete that window).
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2670
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2671 Windows are resized proportional to their size, so bigger windows
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2672 shrink more than smaller windows. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2673 static int *
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2674 shrink_windows (total, size, nchildren, shrinkable,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2675 min_size, resize_fixed_p, forward, width_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2676 int total, size, nchildren, shrinkable, min_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2677 int resize_fixed_p, width_p;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2678 Lisp_Object forward;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2679 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2680 int available_resize = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2681 int *new_sizes;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2682 struct window *c;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2683 Lisp_Object child;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2684 int smallest = total;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2685 int total_removed = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2686 int total_shrink = total - size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2687 int i;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2688
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2689 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2690
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2691 for (i = 0, child = forward; !NILP (child); child = c->next, ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2692 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2693 int child_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2694
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2695 c = XWINDOW (child);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2696 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2697
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2698 if (! resize_fixed_p && window_fixed_size_p (c, width_p, 0))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2699 new_sizes[i] = -1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2700 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2701 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2702 new_sizes[i] = child_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2703 if (child_size > min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2704 available_resize += child_size - min_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2705 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2706 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2707 /* We might need to shrink some windows to zero. Find the smallest
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2708 windows and set them to 0 until we can fulfil the new size. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2709
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2710 while (shrinkable > 1 && size + available_resize < total)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2711 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2712 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2713 if (new_sizes[i] > 0 && smallest > new_sizes[i])
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2714 smallest = new_sizes[i];
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2715
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2716 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2717 if (new_sizes[i] == smallest)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2718 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2719 /* Resize this window down to zero. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2720 new_sizes[i] = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2721 if (smallest > min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2722 available_resize -= smallest - min_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2723 available_resize += smallest;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2724 --shrinkable;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2725 total_removed += smallest;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2726
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2727 /* We don't know what the smallest is now. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2728 smallest = total;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2729
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2730 /* Out of for, just remove one window at the time and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2731 check again if we have enough space. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2732 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2733 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2734 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2735
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2736 /* Now, calculate the new sizes. Try to shrink each window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2737 proportional to its size. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2738 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2739 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2740 if (new_sizes[i] > min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2741 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2742 int to_shrink = total_shrink*new_sizes[i]/total;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2743 if (new_sizes[i] - to_shrink < min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2744 to_shrink = new_sizes[i] - min_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2745 new_sizes[i] -= to_shrink;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2746 total_removed += to_shrink;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2747 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2748 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2749
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2750 /* Any reminder due to rounding, we just subtract from windows
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2751 that are left and still can be shrunk. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2752 while (total_shrink > total_removed)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2753 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2754 int nonzero_sizes = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2755 int nonzero_idx = -1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2756
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2757 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2758 if (new_sizes[i] > 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2759 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2760 ++nonzero_sizes;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2761 nonzero_idx = i;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2762 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2763
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2764 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2765 if (new_sizes[i] > min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2766 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2767 --new_sizes[i];
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2768 ++total_removed;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2769
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2770 /* Out of for, just shrink one window at the time and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2771 check again if we have enough space. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2772 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2773 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2774
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2775
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2776 /* Special case, only one window left. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2777 if (nonzero_sizes == 1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2778 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2779 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2780
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2781 /* Any surplus due to rounding, we add to windows that are left. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2782 while (total_shrink < total_removed)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2783 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2784 for (i = 0; i < nchildren; ++i)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2785 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2786 if (new_sizes[i] != 0 && total_shrink < total_removed)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2787 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2788 ++new_sizes[i];
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2789 --total_removed;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2790 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2791 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2792 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2793 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2794
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2795 return new_sizes;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2796 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2797
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2798 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2799 WINDOW's width. Resize WINDOW's children, if any, so that they
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2800 keep their proportionate size relative to WINDOW. Propagate
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2801 WINDOW's top or left edge position to children. Delete windows
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2802 that become too small unless NODELETE_P is non-zero.
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2803
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2804 If NODELETE_P is 2, that means we do delete windows that are
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2805 too small, even if they were too small before! */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2806
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2807 static void
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2808 size_window (window, size, width_p, nodelete_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2809 Lisp_Object window;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2810 int size, width_p, nodelete_p;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2811 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2812 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2813 struct window *c;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2814 Lisp_Object child, *forward, *sideward;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2815 int old_size, min_size, safe_min_size;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2816
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2817 /* We test nodelete_p != 2 and nodelete_p != 1 below, so it
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2818 seems like it's too soon to do this here. ++KFS. */
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2819 if (nodelete_p == 2)
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2820 nodelete_p = 0;
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2821
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2822 check_min_window_sizes ();
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
2823 size = max (0, size);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2824
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2825 /* If the window has been "too small" at one point,
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2826 don't delete it for being "too small" in the future.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2827 Preserve it as long as that is at all possible. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2828 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2829 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2830 old_size = WINDOW_TOTAL_COLS (w);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2831 min_size = window_min_width;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2832 /* Ensure that there is room for the scroll bar and fringes!
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2833 We may reduce display margins though. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2834 safe_min_size = (MIN_SAFE_WINDOW_WIDTH
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2835 + WINDOW_FRINGE_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2836 + WINDOW_SCROLL_BAR_COLS (w));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2837 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2838 else
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2839 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2840 old_size = XINT (w->total_lines);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2841 min_size = window_min_height;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2842 safe_min_size = MIN_SAFE_WINDOW_HEIGHT;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2843 }
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2844
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2845 if (old_size < min_size && nodelete_p != 2)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2846 w->too_small_ok = Qt;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2847
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2848 /* Maybe delete WINDOW if it's too small. */
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2849 if (nodelete_p != 1 && !NILP (w->parent))
25268
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 if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2852 min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2853 if (min_size < safe_min_size)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2854 min_size = safe_min_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2855 if (size < min_size)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2856 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2857 delete_window (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2858 return;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2859 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2860 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2861
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2862 /* Set redisplay hints. */
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
2863 w->last_modified = make_number (0);
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
2864 w->last_overlay_modified = make_number (0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2865 windows_or_buffers_changed++;
32824
6521cc146e8e (size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents: 32800
diff changeset
2866 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2867
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2868 if (width_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2869 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2870 sideward = &w->vchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2871 forward = &w->hchild;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2872 w->total_cols = make_number (size);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2873 adjust_window_margins (w);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2874 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2875 else
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 sideward = &w->hchild;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2878 forward = &w->vchild;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2879 w->total_lines = make_number (size);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2880 w->orig_total_lines = Qnil;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2881 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2882
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2883 if (!NILP (*sideward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2884 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2885 for (child = *sideward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2886 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2887 c = XWINDOW (child);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2888 if (width_p)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2889 c->left_col = w->left_col;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2890 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2891 c->top_line = w->top_line;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2892 size_window (child, size, width_p, nodelete_p);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2893 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2894 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2895 else if (!NILP (*forward))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2896 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2897 int fixed_size, each, extra, n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2898 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
2899 int last_pos, first_pos, nchildren, total;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2900 int *new_sizes = NULL;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2901
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2902 /* Determine the fixed-size portion of the this window, and the
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2903 number of child windows. */
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
2904 fixed_size = nchildren = nfixed = total = 0;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2905 for (child = *forward; !NILP (child); child = c->next, ++nchildren)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2906 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
2907 int child_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2908
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2909 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2910 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines);
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
2911 total += child_size;
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 if (window_fixed_size_p (c, width_p, 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2914 {
32928
859adc7ac97d (size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents: 32871
diff changeset
2915 fixed_size += child_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2916 ++nfixed;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2917 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2918 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2919
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2920 /* 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
2921 aren't any resizable windows, allow resizing fixed-size
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2922 windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2923 resize_fixed_p = nfixed == nchildren || size < fixed_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2924
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2925 /* 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
2926 value of extra takes care of rounding errors. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2927 n = resize_fixed_p ? nchildren : nchildren - nfixed;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2928 if (size < total && n > 1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2929 new_sizes = shrink_windows (total, size, nchildren, n, min_size,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2930 resize_fixed_p, *forward, width_p);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2931 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2932 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2933 each = (size - total) / n;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2934 extra = (size - total) - n * each;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2935 }
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2936
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2937 /* Compute new children heights and edge positions. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2938 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
2939 last_pos = first_pos;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2940 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
2941 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2942 int new_size, old_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2943
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2944 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2945 old_size = width_p ? XFASTINT (c->total_cols) : XFASTINT (c->total_lines);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2946 new_size = old_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2947
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2948 /* 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
2949 bottom or right edge of its predecessor. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2950 if (width_p)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2951 c->left_col = make_number (last_pos);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2952 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2953 c->top_line = make_number (last_pos);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2954
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2955 /* If this child can be resized, do it. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2956 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
2957 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2958 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
2959 extra = 0;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2960 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2961
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2962 /* Set new height. Note that size_window also propagates
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2963 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
2964 didn't change the child's size. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2965 size_window (child, new_size, width_p, 1);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2966
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2967 /* Remember the bottom/right edge position of this child; it
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2968 will be used to set the top/left edge of the next child. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2969 last_pos += new_size;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2970 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2971
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2972 if (new_sizes) xfree (new_sizes);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2973
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2974 /* We should have covered the parent exactly with child windows. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2975 xassert (size == last_pos - first_pos);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
2976
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2977 /* Now delete any children that became too small. */
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2978 if (!nodelete_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2979 for (child = *forward; !NILP (child); child = c->next)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2980 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2981 int child_size;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2982 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
2983 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines);
42603
37c66e967beb (delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents: 42351
diff changeset
2984 size_window (child, child_size, width_p, 2);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2985 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2986 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2987 }
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2988
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2989 /* Set WINDOW's height to HEIGHT, and recursively change the height of
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2990 WINDOW's children. NODELETE non-zero means don't delete windows
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2991 that become too small in the process. (The caller should check
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
2992 later and do so if appropriate.) */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2993
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
2994 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2995 set_window_height (window, height, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2996 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2997 int height;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2998 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2999 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3000 size_window (window, height, 0, nodelete);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3001 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3002
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3003
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3004 /* Set WINDOW's width to WIDTH, and recursively change the width of
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3005 WINDOW's children. NODELETE non-zero means don't delete windows
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3006 that become too small in the process. (The caller should check
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3007 later and do so if appropriate.) */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3008
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3009 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010 set_window_width (window, width, nodelete)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3012 int width;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3013 int nodelete;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3014 {
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3015 size_window (window, width, 1, nodelete);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3016 }
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3017
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3018 /* Change window heights in windows rooted in WINDOW by N lines. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3019
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3020 void
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3021 change_window_heights (window, n)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3022 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3023 int n;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3024 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3025 struct window *w = XWINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3026
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3027 XSETFASTINT (w->top_line, XFASTINT (w->top_line) + n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3028 XSETFASTINT (w->total_lines, XFASTINT (w->total_lines) - n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3029
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3030 if (INTEGERP (w->orig_top_line))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3031 XSETFASTINT (w->orig_top_line, XFASTINT (w->orig_top_line) + n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3032 if (INTEGERP (w->orig_total_lines))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3033 XSETFASTINT (w->orig_total_lines, XFASTINT (w->orig_total_lines) - n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3034
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3035 /* Handle just the top child in a vertical split. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3036 if (!NILP (w->vchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3037 change_window_heights (w->vchild, n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3038
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3039 /* Adjust all children in a horizontal split. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3040 for (window = w->hchild; !NILP (window); window = w->next)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3041 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3042 w = XWINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3043 change_window_heights (window, n);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3044 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3045 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3046
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3047
362
d1e5cf833d37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 358
diff changeset
3048 int window_select_count;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3049
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3050 Lisp_Object
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3051 Fset_window_buffer_unwind (obuf)
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3052 Lisp_Object obuf;
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3053 {
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3054 Fset_buffer (obuf);
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3055 return Qnil;
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3056 }
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
3057
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3058 EXFUN (Fset_window_fringes, 4);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3059 EXFUN (Fset_window_scroll_bars, 4);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3060
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3061 /* 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
3062 means it's allowed to run hooks. See make_frame for a case where
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3063 it's not allowed. KEEP_MARGINS_P non-zero means that the current
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3064 margins, fringes, and scroll-bar settings of the window are not
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3065 reset from the buffer's local settings. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3066
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3067 void
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3068 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
3069 Lisp_Object window, buffer;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3070 int run_hooks_p, keep_margins_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3071 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3072 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3073 struct buffer *b = XBUFFER (buffer);
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
3074 int count = SPECPDL_INDEX ();
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3075
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3076 w->buffer = buffer;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3077
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3078 if (EQ (window, selected_window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3079 b->last_selected_window = window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3080
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3081 /* Let redisplay errors through. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3082 b->display_error_modiff = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3083
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3084 /* Update time stamps of buffer display. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3085 if (INTEGERP (b->display_count))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3086 XSETINT (b->display_count, XINT (b->display_count) + 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3087 b->display_time = Fcurrent_time ();
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3088
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3089 XSETFASTINT (w->window_end_pos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3090 XSETFASTINT (w->window_end_vpos, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3091 bzero (&w->last_cursor, sizeof w->last_cursor);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3092 w->window_end_valid = Qnil;
36133
6eb00bee0989 (set_window_buffer): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36131
diff changeset
3093 w->hscroll = w->min_hscroll = make_number (0);
36444
f2fc8b180aaa * window.c (set_window_buffer): Field vscroll is an int, not a lisp object.
Ken Raeburn <raeburn@raeburn.org>
parents: 36432
diff changeset
3094 w->vscroll = 0;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3095 set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3096 set_marker_restricted (w->start,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3097 make_number (b->last_window_start),
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3098 buffer);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3099 w->start_at_line_beg = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3100 w->force_start = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3101 XSETFASTINT (w->last_modified, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3102 XSETFASTINT (w->last_overlay_modified, 0);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3103 windows_or_buffers_changed++;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3104
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3105 /* We must select BUFFER for running the window-scroll-functions.
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3106 If WINDOW is selected, switch permanently.
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3107 Otherwise, switch but go back to the ambient buffer afterward. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3108 if (EQ (window, selected_window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3109 Fset_buffer (buffer);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3110 /* We can't check ! NILP (Vwindow_scroll_functions) here
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3111 because that might itself be a local variable. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3112 else if (window_initialized)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3113 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3114 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ());
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3115 Fset_buffer (buffer);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3116 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3117
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3118 if (!keep_margins_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3119 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3120 /* Set left and right marginal area width etc. from buffer. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3121
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3122 /* This may call adjust_window_margins three times, so
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3123 temporarily disable window margins. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3124 Lisp_Object save_left = w->left_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3125 Lisp_Object save_right = w->right_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3126
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3127 w->left_margin_cols = w->right_margin_cols = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3128
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3129 Fset_window_fringes (window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3130 b->left_fringe_width, b->right_fringe_width,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3131 b->fringes_outside_margins);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3132
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3133 Fset_window_scroll_bars (window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3134 b->scroll_bar_width,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3135 b->vertical_scroll_bar_type, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3136
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3137 w->left_margin_cols = save_left;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3138 w->right_margin_cols = save_right;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3139
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3140 Fset_window_margins (window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3141 b->left_margin_cols, b->right_margin_cols);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3142 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3143
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3144 if (run_hooks_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3145 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3146 if (! NILP (Vwindow_scroll_functions))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3147 run_hook_with_args_2 (Qwindow_scroll_functions, window,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3148 Fmarker_position (w->start));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3149
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3150 if (! NILP (Vwindow_configuration_change_hook)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3151 && ! NILP (Vrun_hooks))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3152 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3153 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3154
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3155 unbind_to (count, Qnil);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3156 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3157
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3158
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3159 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3160 doc: /* Make WINDOW display BUFFER as its contents.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3161 BUFFER can be a buffer or the name of an existing buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3162 Optional third arg KEEP-MARGINS non-nil means that WINDOW's current
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3163 display margins, fringe widths, and scroll bar settings are maintained;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3164 the default is to reset these from BUFFER's local settings or the frame
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3165 defaults.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3166
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3167 This function runs the hook `window-scroll-functions'. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3168 (window, buffer, keep_margins)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3169 register Lisp_Object window, buffer, keep_margins;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3170 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3171 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3172 register struct window *w = decode_window (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3173
27848
27b993d2ea05 (Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents: 27699
diff changeset
3174 XSETWINDOW (window, w);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3175 buffer = Fget_buffer (buffer);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3176 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3177
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3178 if (NILP (XBUFFER (buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3179 error ("Attempt to display deleted buffer");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3180
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3181 tem = w->buffer;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3182 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3183 error ("Window is deleted");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3184 else if (! EQ (tem, Qt)) /* w->buffer is t when the window
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3185 is first being set up. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3186 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3187 if (!NILP (w->dedicated) && !EQ (tem, buffer))
7545
0e1f3b9598bb (Fset_window_buffer): Fix dedicated window error call.
Richard M. Stallman <rms@gnu.org>
parents: 7348
diff changeset
3188 error ("Window is dedicated to `%s'",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3189 SDATA (XBUFFER (tem)->name));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3190
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191 unshow_buffer (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3192 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3193
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3194 set_window_buffer (window, buffer, 1, !NILP (keep_margins));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3195 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3196 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3197
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3198 /* Note that selected_window can be nil
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3199 when this is called from Fset_window_configuration. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3200
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3201 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
3202 doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3203 If WINDOW is not already selected, make WINDOW's buffer current
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3204 and make WINDOW the frame's selected window. Return WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3205 Optional second arg NORECORD non-nil means
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3206 do not put this buffer at the front of the list of recently selected ones.
47567
1075de6f6ebd (select_window_1): Don't select frame.
Richard M. Stallman <rms@gnu.org>
parents: 47234
diff changeset
3207
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3208 Note that the main editor command loop
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3209 selects the buffer of the selected window before each command. */)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3210 (window, norecord)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3211 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
3212 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3213 register struct window *w;
27869
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3214 register struct window *ow;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3215 struct frame *sf;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3216
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3217 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3218
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3219 w = XWINDOW (window);
39953
3a1666ed16b8 (select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents: 39952
diff changeset
3220 w->frozen_window_start_p = 0;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3221
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3222 ++window_select_count;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3223 XSETFASTINT (w->use_time, window_select_count);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3224 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3225 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3226
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3227 /* Store the current buffer's actual point into the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3228 old selected window. It belongs to that window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3229 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
3230 if (!NILP (selected_window))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3231 {
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3232 ow = XWINDOW (selected_window);
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3233 if (! NILP (ow->buffer))
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3234 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
3235 BUF_PT (XBUFFER (ow->buffer)),
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3236 BUF_PT_BYTE (XBUFFER (ow->buffer)));
1322db65a230 (select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents: 27850
diff changeset
3237 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3238
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3239 selected_window = window;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3240 sf = SELECTED_FRAME ();
48927
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3241 if (XFRAME (WINDOW_FRAME (w)) != sf)
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3242 {
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3243 XFRAME (WINDOW_FRAME (w))->selected_window = window;
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3244 /* Use this rather than Fhandle_switch_frame
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3245 so that FRAME_FOCUS_FRAME is moved appropriately as we
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3246 move around in the state where a minibuffer in a separate
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3247 frame is active. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3248 Fselect_frame (WINDOW_FRAME (w));
48927
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3249 }
148675770a17 (select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents: 48898
diff changeset
3250 else
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3251 sf->selected_window = window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3252
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3253 if (NILP (norecord))
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3254 record_buffer (w->buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3255 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3256
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
3257 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
3258
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3259 /* Go to the point recorded in the window.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3260 This is important when the buffer is in more
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3261 than one window. It also matters when
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3262 redisplay_window has altered point after scrolling,
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3263 because it makes the change only in the window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3265 register int new_point = marker_position (w->pointm);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 if (new_point < BEGV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 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
3268 else if (new_point > ZV)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3269 SET_PT (ZV);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3270 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3271 SET_PT (new_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3272 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3273
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3274 windows_or_buffers_changed++;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3275 return window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3276 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3277
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3278 static Lisp_Object
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3279 select_window_norecord (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3280 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3281 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3282 return Fselect_window (window, Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3283 }
22187
9509e86a7be5 (window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 22155
diff changeset
3284
14175
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3285 /* Deiconify the frame containing the window WINDOW,
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3286 unless it is the selected frame;
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3287 then return WINDOW.
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3288
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3289 The reason for the exception for the selected frame
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3290 is that it seems better not to change the selected frames visibility
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3291 merely because of displaying a different buffer in it.
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3292 The deiconification is useful when a buffer gets shown in
ace33b55f549 (display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 14166
diff changeset
3293 another frame that you were not using lately. */
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3294
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3295 static Lisp_Object
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3296 display_buffer_1 (window)
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3297 Lisp_Object window;
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3298 {
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3299 Lisp_Object frame = XWINDOW (window)->frame;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3300 FRAME_PTR f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3301
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3302 FRAME_SAMPLE_VISIBILITY (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3303
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3304 if (EQ (frame, selected_frame))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3305 ; /* Assume the selected frame is already visible enough. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3306 else if (minibuf_level > 0
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3307 && MINI_WINDOW_P (XWINDOW (selected_window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3308 && WINDOW_LIVE_P (minibuf_selected_window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3309 && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3310 ; /* Assume the frame from which we invoked the minibuffer is visible. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3311 else
14535
8ca7e641c144 (display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents: 14445
diff changeset
3312 {
8ca7e641c144 (display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents: 14445
diff changeset
3313 if (FRAME_ICONIFIED_P (f))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3314 Fmake_frame_visible (frame);
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
3315 else if (FRAME_VISIBLE_P (f))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3316 Fraise_frame (frame);
14535
8ca7e641c144 (display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents: 14445
diff changeset
3317 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3318
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3319 return window;
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3320 }
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3321
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3322 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3323 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3324 If the value is t, `display-buffer' or `pop-to-buffer' would create a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3325 special frame for that buffer using the default frame parameters.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3326
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3327 If the value is a list, it is a list of frame parameters that would be used
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3328 to make a frame for that buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3329 The variables `special-display-buffer-names'
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3330 and `special-display-regexps' control this. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3331 (buffer_name)
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3332 Lisp_Object buffer_name;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3333 {
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3334 Lisp_Object tem;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3335
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3336 CHECK_STRING (buffer_name);
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3337
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3338 tem = Fmember (buffer_name, Vspecial_display_buffer_names);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3339 if (!NILP (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3340 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3341
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3342 tem = Fassoc (buffer_name, Vspecial_display_buffer_names);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3343 if (!NILP (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3344 return XCDR (tem);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3345
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3346 for (tem = Vspecial_display_regexps; CONSP (tem); tem = XCDR (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3347 {
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3348 Lisp_Object car = XCAR (tem);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3349 if (STRINGP (car)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3350 && fast_string_match (car, buffer_name) >= 0)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3351 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3352 else if (CONSP (car)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3353 && STRINGP (XCAR (car))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3354 && fast_string_match (XCAR (car), buffer_name) >= 0)
20653
19ba67f153d5 (Fspecial_display_p): Return the right value
Richard M. Stallman <rms@gnu.org>
parents: 20627
diff changeset
3355 return XCDR (car);
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3356 }
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3357 return Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3358 }
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3359
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3360 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3361 doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3362 More precisely, if `display-buffer' or `pop-to-buffer' would display
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3363 that buffer in the selected window rather than (as usual) in some other window.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3364 See `same-window-buffer-names' and `same-window-regexps'. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3365 (buffer_name)
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3366 Lisp_Object buffer_name;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3367 {
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3368 Lisp_Object tem;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3369
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3370 CHECK_STRING (buffer_name);
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3371
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3372 tem = Fmember (buffer_name, Vsame_window_buffer_names);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3373 if (!NILP (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3374 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3375
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3376 tem = Fassoc (buffer_name, Vsame_window_buffer_names);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3377 if (!NILP (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3378 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3379
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3380 for (tem = Vsame_window_regexps; CONSP (tem); tem = XCDR (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3381 {
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3382 Lisp_Object car = XCAR (tem);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3383 if (STRINGP (car)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3384 && fast_string_match (car, buffer_name) >= 0)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3385 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3386 else if (CONSP (car)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3387 && STRINGP (XCAR (car))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3388 && fast_string_match (XCAR (car), buffer_name) >= 0)
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3389 return Qt;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3390 }
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3391 return Qnil;
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3392 }
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3393
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3394 /* Use B so the default is (other-buffer). */
20867
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
3395 DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3396 "BDisplay buffer: \nP",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3397 doc: /* Make BUFFER appear in some window but don't select it.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3398 BUFFER must be the name of an existing buffer, or, when called from Lisp,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3399 a buffer.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3400 If BUFFER is shown already in some window, just use that one,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3401 unless the window is the selected window and the optional second
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3402 argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3403 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3404 Returns the window displaying BUFFER.
44155
d94cb7b3b165 (Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43713
diff changeset
3405 If `display-buffer-reuse-frames' is non-nil, and another frame is currently
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3406 displaying BUFFER, then simply raise that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3407
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3408 The variables `special-display-buffer-names',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3409 `special-display-regexps', `same-window-buffer-names', and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3410 `same-window-regexps' customize how certain buffer names are handled.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3411 The latter two take effect only if NOT-THIS-WINDOW is t.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3412
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3413 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
3414 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
3415 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
3416 If FRAME is a frame, search only that frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3417 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
3418 (actually the last nonminibuffer frame),
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3419 unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3420 which means search visible and iconified frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3421
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3422 If a full-width window on a splittable frame is available to display
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3423 the buffer, it may be split, subject to the value of the variable
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3424 `split-height-threshold'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3425
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3426 If `even-window-heights' is non-nil, window heights will be evened out
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3427 if displaying the buffer causes two vertically adjacent windows to be
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3428 displayed. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3429 (buffer, not_this_window, frame)
20867
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
3430 register Lisp_Object buffer, not_this_window, frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3431 {
25182
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3432 register Lisp_Object window, tem, swp;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3433 struct frame *f;
25182
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3434
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3435 swp = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3436 buffer = Fget_buffer (buffer);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3437 CHECK_BUFFER (buffer);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3438
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3439 if (!NILP (Vdisplay_buffer_function))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3440 return call2 (Vdisplay_buffer_function, buffer, not_this_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3441
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3442 if (NILP (not_this_window)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3443 && XBUFFER (XWINDOW (selected_window)->buffer) == XBUFFER (buffer))
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3444 return display_buffer_1 (selected_window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3445
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3446 /* See if the user has specified this buffer should appear
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3447 in the selected window. */
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3448 if (NILP (not_this_window))
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3449 {
25182
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3450 swp = Fsame_window_p (XBUFFER (buffer)->name);
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3451 if (!NILP (swp) && !no_switch_window (selected_window))
11003
71304a70d0f6 (Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents: 10958
diff changeset
3452 {
71304a70d0f6 (Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents: 10958
diff changeset
3453 Fswitch_to_buffer (buffer, Qnil);
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3454 return display_buffer_1 (selected_window);
11003
71304a70d0f6 (Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents: 10958
diff changeset
3455 }
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3456 }
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
3457
44155
d94cb7b3b165 (Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 43713
diff changeset
3458 /* If the user wants pop-up-frames or display-buffer-reuse-frames,
11427
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3459 look for a window showing BUFFER on any visible or iconified frame.
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3460 Otherwise search only the current frame. */
20867
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
3461 if (! NILP (frame))
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
3462 tem = frame;
30560
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
3463 else if (pop_up_frames
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
3464 || display_buffer_reuse_frames
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
3465 || last_nonminibuf_frame == 0)
11427
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3466 XSETFASTINT (tem, 0);
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3467 else
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3468 XSETFRAME (tem, last_nonminibuf_frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3469
11427
c4ee56df7173 (Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents: 11405
diff changeset
3470 window = Fget_buffer_window (buffer, tem);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3471 if (!NILP (window)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3472 && (NILP (not_this_window) || !EQ (window, selected_window)))
30560
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
3473 return display_buffer_1 (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3474
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3475 /* Certain buffer names get special handling. */
25182
ef79ee0ceedd (display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents: 25115
diff changeset
3476 if (!NILP (Vspecial_display_function) && NILP (swp))
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3477 {
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3478 tem = Fspecial_display_p (XBUFFER (buffer)->name);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3479 if (EQ (tem, Qt))
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3480 return call1 (Vspecial_display_function, buffer);
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3481 if (CONSP (tem))
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
3482 return call2 (Vspecial_display_function, buffer, tem);
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3483 }
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3484
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3485 /* If there are no frames open that have more than a minibuffer,
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3486 we need to create a new frame. */
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3487 if (pop_up_frames || last_nonminibuf_frame == 0)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3488 {
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
3489 window = Fframe_selected_window (call0 (Vpop_up_frame_function));
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3490 Fset_window_buffer (window, buffer, Qnil);
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3491 return display_buffer_1 (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3492 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3493
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3494 f = SELECTED_FRAME ();
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
3495 if (pop_up_windows
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3496 || FRAME_MINIBUF_ONLY_P (f)
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3497 /* If the current frame is a special display frame,
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3498 don't try to reuse its windows. */
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3499 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (f))->dedicated))
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
3500 {
6517
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
3501 Lisp_Object frames;
8f5f79c3091a (unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents: 6487
diff changeset
3502
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
3503 frames = Qnil;
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3504 if (FRAME_MINIBUF_ONLY_P (f))
9282
f4fa46f6a032 (Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents: 9243
diff changeset
3505 XSETFRAME (frames, last_nonminibuf_frame);
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
3506 /* Don't try to create a window if we would get an error. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3507 if (split_height_threshold < window_min_height << 1)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3508 split_height_threshold = window_min_height << 1;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3509
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3510 /* Note that both Fget_largest_window and Fget_lru_window
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3511 ignore minibuffers and dedicated windows.
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3512 This means they can return nil. */
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3513
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3514 /* If the frame we would try to split cannot be split,
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3515 try other frames. */
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3516 if (FRAME_NO_SPLIT_P (NILP (frames) ? f : last_nonminibuf_frame))
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3517 {
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3518 /* Try visible frames first. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3519 window = Fget_largest_window (Qvisible, Qt);
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3520 /* If that didn't work, try iconified frames. */
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3521 if (NILP (window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3522 window = Fget_largest_window (make_number (0), Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3523 #if 0 /* Don't try windows on other displays. */
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3524 if (NILP (window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3525 window = Fget_largest_window (Qt, Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3526 #endif
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3527 }
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3528 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3529 window = Fget_largest_window (frames, Qt);
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3530
9567
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3531 /* If we got a tall enough full-width window that can be split,
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3532 split it. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3533 if (!NILP (window)
9567
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3534 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3535 && window_height (window) >= split_height_threshold
16297
701db778b7a4 (Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents: 16208
diff changeset
3536 && WINDOW_FULL_WIDTH_P (XWINDOW (window)))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3537 window = Fsplit_window (window, Qnil, Qnil);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3538 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3539 {
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3540 Lisp_Object upper, lower, other;
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3541
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3542 window = Fget_lru_window (frames, Qt);
9567
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3543 /* If the LRU window is selected, and big enough,
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3544 and can be split, split it. */
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3545 if (!NILP (window)
9567
cf4f4c8a3ef6 (Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents: 9324
diff changeset
3546 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3547 && (EQ (window, selected_window)
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3548 || EQ (XWINDOW (window)->parent, Qnil))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3549 && window_height (window) >= window_min_height << 1)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3550 window = Fsplit_window (window, Qnil, Qnil);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3551 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3552 window = Fget_lru_window (frames, Qnil);
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3553 /* If Fget_lru_window returned nil, try other approaches. */
17628
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3554
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3555 /* Try visible frames first. */
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3556 if (NILP (window))
17628
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3557 window = Fget_buffer_window (buffer, Qvisible);
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3558 if (NILP (window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3559 window = Fget_largest_window (Qvisible, Qnil);
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3560 /* If that didn't work, try iconified frames. */
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3561 if (NILP (window))
17628
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3562 window = Fget_buffer_window (buffer, make_number (0));
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3563 if (NILP (window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3564 window = Fget_largest_window (make_number (0), Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3565
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3566 #if 0 /* Don't try frames on other displays. */
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3567 if (NILP (window))
17628
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3568 window = Fget_buffer_window (buffer, Qt);
0b6db83d4663 (Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents: 17540
diff changeset
3569 if (NILP (window))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3570 window = Fget_largest_window (Qt, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3571 #endif
8263
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3572 /* As a last resort, make a new frame. */
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3573 if (NILP (window))
bae811318a57 (Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents: 8245
diff changeset
3574 window = Fframe_selected_window (call0 (Vpop_up_frame_function));
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3575 /* If window appears above or below another,
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3576 even out their heights. */
11750
b911d6f75664 (Fdisplay_buffer): Initialize other, upper, lower.
Richard M. Stallman <rms@gnu.org>
parents: 11731
diff changeset
3577 other = upper = lower = Qnil;
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3578 if (!NILP (XWINDOW (window)->prev))
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3579 other = upper = XWINDOW (window)->prev, lower = window;
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3580 if (!NILP (XWINDOW (window)->next))
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3581 other = lower = XWINDOW (window)->next, upper = window;
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3582 if (!NILP (other)
34261
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
3583 && !NILP (Veven_window_heights)
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3584 /* Check that OTHER and WINDOW are vertically arrayed. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3585 && !EQ (XWINDOW (other)->top_line, XWINDOW (window)->top_line)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3586 && (XFASTINT (XWINDOW (other)->total_lines)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3587 > XFASTINT (XWINDOW (window)->total_lines)))
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3588 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3589 int total = (XFASTINT (XWINDOW (other)->total_lines)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3590 + XFASTINT (XWINDOW (window)->total_lines));
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
3591 enlarge_window (upper,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3592 total / 2 - XFASTINT (XWINDOW (upper)->total_lines),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3593 0);
9614
e466cdfd962e (Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents: 9572
diff changeset
3594 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3595 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3596 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3597 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3598 window = Fget_lru_window (Qnil, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3599
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3600 Fset_window_buffer (window, buffer, Qnil);
13619
3fa8cd29e1da (Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents: 13583
diff changeset
3601 return display_buffer_1 (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3602 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3603
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3604
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3605 DEFUN ("force-window-update", Fforce_window_update, Sforce_window_update,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3606 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3607 doc: /* Force redisplay of all windows.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3608 If optional arg OBJECT is a window, force redisplay of that window only.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3609 If OBJECT is a buffer or buffer name, force redisplay of all windows
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3610 displaying that buffer. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3611 (object)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3612 Lisp_Object object;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3613 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3614 if (NILP (object))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3615 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3616 windows_or_buffers_changed++;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3617 update_mode_lines++;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3618 return Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3619 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3620
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3621 if (WINDOWP (object))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3622 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3623 struct window *w = XWINDOW (object);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3624 mark_window_display_accurate (object, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3625 w->update_mode_line = Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3626 if (BUFFERP (w->buffer))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3627 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3628 ++update_mode_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3629 return Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3630 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3631
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3632 if (STRINGP (object))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3633 object = Fget_buffer (object);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3634 if (BUFFERP (object) && !NILP (XBUFFER (object)->name))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3635 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3636 /* Walk all windows looking for buffer, and force update
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3637 of each of those windows. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3638
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3639 object = window_loop (REDISPLAY_BUFFER_WINDOWS, object, 0, Qvisible);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3640 return NILP (object) ? Qnil : Qt;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3641 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3642
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3643 /* If nothing suitable was found, just return.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3644 We could signal an error, but this feature will typically be used
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3645 asynchronously in timers or process sentinels, so we don't. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3646 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3647 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3648
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3649
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3650 void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651 temp_output_buffer_show (buf)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3652 register Lisp_Object buf;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3653 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3654 register struct buffer *old = current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 register Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3656 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3657
18493
d65021d5c39e (temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 18065
diff changeset
3658 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
3659
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3660 Fset_buffer (buf);
10302
34556316a48a (temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 10043
diff changeset
3661 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3662 BEGV = BEG;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3663 ZV = Z;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3664 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
3665 #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
3666 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
3667 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3668 set_buffer_internal (old);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3669
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3670 if (!NILP (Vtemp_buffer_show_function))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3671 call1 (Vtemp_buffer_show_function, buf);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3672 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 {
20867
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
3674 window = Fdisplay_buffer (buf, Qnil, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3675
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
3676 if (!EQ (XWINDOW (window)->frame, selected_frame))
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3677 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3678 Vminibuf_scroll_window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3679 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
3680 XSETFASTINT (w->hscroll, 0);
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
3681 XSETFASTINT (w->min_hscroll, 0);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3682 set_marker_restricted_both (w->start, buf, BEG, BEG);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3683 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
3684
22149
ad3ee5ec90d1 (Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 21844
diff changeset
3685 /* 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
3686 and its buffer current. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3687
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3688 if (!NILP (Vrun_hooks)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3689 && !NILP (Fboundp (Qtemp_buffer_show_hook))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3690 && !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
3691 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3692 int count = SPECPDL_INDEX ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3693 Lisp_Object prev_window, prev_buffer;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3694 prev_window = selected_window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3695 XSETBUFFER (prev_buffer, old);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3696
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3697 /* Select the window that was chosen, for running the hook.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3698 Note: Both Fselect_window and select_window_norecord may
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3699 set-buffer to the buffer displayed in the window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3700 so we need to save the current buffer. --stef */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3701 record_unwind_protect (Fset_buffer, prev_buffer);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3702 record_unwind_protect (select_window_norecord, prev_window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3703 Fselect_window (window, Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3704 Fset_buffer (w->buffer);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3705 call1 (Vrun_hooks, Qtemp_buffer_show_hook);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3706 unbind_to (count, Qnil);
11405
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3707 }
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
3708 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3709 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3710
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
3711 static void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3712 make_dummy_parent (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3713 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3714 {
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3715 Lisp_Object new;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3716 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
3717 int i;
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3718
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3719 o = XWINDOW (window);
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3720 p = allocate_window ();
9970
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3721 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
3722 ((struct Lisp_Vector *) p)->contents[i]
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
3723 = ((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
3724 XSETWINDOW (new, p);
76910d506a80 (make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9964
diff changeset
3725
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3726 ++sequence_number;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3727 XSETFASTINT (p->sequence_number, sequence_number);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3728
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3729 /* Put new into window structure in place of window */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3730 replace_window (window, new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3731
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3732 o->next = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3733 o->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3734 o->vchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3735 o->hchild = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3736 o->parent = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3737
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3738 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3739 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3740 p->buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3741 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3742
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3743 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
3744 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
3745 WINDOW defaults to selected one and SIZE to half its size.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3746 If optional third arg HORFLAG is non-nil, split side by side
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3747 and put SIZE columns in the first of the pair. In that case,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3748 SIZE includes that window's scroll bar, or the divider column to its right.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3749 Interactively, all arguments are nil.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3750
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3751 Returns the newly created window (which is the lower or rightmost one).
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3752 The upper or leftmost window is the original one and remains selected.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3753 See Info node `(elisp)Splitting Windows' for more details and examples.*/)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3754 (window, size, horflag)
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3755 Lisp_Object window, size, horflag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3757 register Lisp_Object new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758 register struct window *o, *p;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3759 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
3760 register int size_int;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3761
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3762 if (NILP (window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3763 window = selected_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3764 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3765 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3766
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3767 o = XWINDOW (window);
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3768 fo = XFRAME (WINDOW_FRAME (o));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3769
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3770 if (NILP (size))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3771 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3772 if (!NILP (horflag))
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3773 /* 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
3774 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
3775 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
3776 a dividing line, while the right-hand may not. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3777 size_int = (XFASTINT (o->total_cols) + 1) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3778 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3779 size_int = XFASTINT (o->total_lines) >> 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3780 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3781 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3782 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3783 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
3784 size_int = XINT (size);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3785 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3786
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3787 if (MINI_WINDOW_P (o))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3788 error ("Attempt to split minibuffer window");
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3789 else if (window_fixed_size_p (o, !NILP (horflag), 0))
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3790 error ("Attempt to split fixed-size window");
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3791
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
3792 check_min_window_sizes ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3793
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3794 if (NILP (horflag))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3795 {
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3796 if (size_int < window_min_height)
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3797 error ("Window height %d too small (after splitting)", size_int);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3798 if (size_int + window_min_height > XFASTINT (o->total_lines))
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
3799 error ("Window height %d too small (after splitting)",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3800 XFASTINT (o->total_lines) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3801 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3802 || NILP (XWINDOW (o->parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3803 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3805 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3806 XWINDOW (new)->vchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3807 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3808 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3809 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3810 {
13780
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3811 if (size_int < window_min_width)
732a8bd9c552 (Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents: 13723
diff changeset
3812 error ("Window width %d too small (after splitting)", size_int);
15902
985270efc514 (Fsplit_window): Treat width just like height;
Richard M. Stallman <rms@gnu.org>
parents: 15712
diff changeset
3813
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3814 if (size_int + window_min_width > XFASTINT (o->total_cols))
14536
12de7dac154b (display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents: 14535
diff changeset
3815 error ("Window width %d too small (after splitting)",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3816 XFASTINT (o->total_cols) - size_int);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3817 if (NILP (o->parent)
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3818 || NILP (XWINDOW (o->parent)->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3819 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3820 make_dummy_parent (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3821 new = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3822 XWINDOW (new)->hchild = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3823 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3824 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3825
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3826 /* Now we know that window's parent is a vertical combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3827 if we are dividing vertically, or a horizontal combination
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3828 if we are making side-by-side windows */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3829
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3830 windows_or_buffers_changed++;
13723
4e170419e83c (Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents: 13619
diff changeset
3831 FRAME_WINDOW_SIZES_CHANGED (fo) = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832 new = make_window ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833 p = XWINDOW (new);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3834
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3835 p->frame = o->frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3836 p->next = o->next;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3837 if (!NILP (p->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3838 XWINDOW (p->next)->prev = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3839 p->prev = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3840 o->next = new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3841 p->parent = o->parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3842 p->buffer = Qt;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3843 p->window_end_valid = Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3844 bzero (&p->last_cursor, sizeof p->last_cursor);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3845
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3846 /* Duplicate special geometry settings. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3847
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3848 p->left_margin_cols = o->left_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3849 p->right_margin_cols = o->right_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3850 p->left_fringe_width = o->left_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3851 p->right_fringe_width = o->right_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3852 p->fringes_outside_margins = o->fringes_outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3853 p->scroll_bar_width = o->scroll_bar_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3854 p->vertical_scroll_bar_type = o->vertical_scroll_bar_type;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3855
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
3856 /* Apportion the available frame space among the two new windows */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3858 if (!NILP (horflag))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3860 p->total_lines = o->total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3861 p->top_line = o->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3862 XSETFASTINT (p->total_cols, XFASTINT (o->total_cols) - size_int);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3863 XSETFASTINT (o->total_cols, size_int);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3864 XSETFASTINT (p->left_col, XFASTINT (o->left_col) + size_int);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3865 adjust_window_margins (p);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3866 adjust_window_margins (o);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3867 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3868 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3869 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3870 p->left_col = o->left_col;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3871 p->total_cols = o->total_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3872 XSETFASTINT (p->total_lines, XFASTINT (o->total_lines) - size_int);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3873 XSETFASTINT (o->total_lines, size_int);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3874 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3875 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3876
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3877 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
3878 adjust_glyphs (fo);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3879
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3880 Fset_window_buffer (new, o->buffer, Qt);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3881 return new;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3882 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3883
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3884 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 2, "p",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3885 doc: /* Make current window ARG lines bigger.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3886 From program, optional second arg non-nil means grow sideways ARG columns.
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
3887 Interactively, if an argument is not given, make the window one line bigger.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3888 If HORIZONTAL is non-nil, enlarge horizontally instead of vertically.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3889 This function can delete windows, even the second window, if they get
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3890 too small. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3891 (arg, horizontal)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3892 Lisp_Object arg, horizontal;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3894 CHECK_NUMBER (arg);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3895 enlarge_window (selected_window, XINT (arg), !NILP (horizontal));
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3896
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3897 if (! NILP (Vwindow_configuration_change_hook))
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3898 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3899
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3900 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3901 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3902
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3903 DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3904 doc: /* Make current window ARG lines smaller.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
3905 From program, optional second arg non-nil means shrink sideways arg columns.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3906 Interactively, if an argument is not given, make the window one line smaller. Only
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
3907 siblings to the right or below are changed. */)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3908 (arg, side)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3909 Lisp_Object arg, side;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3910 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
3911 CHECK_NUMBER (arg);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3912 enlarge_window (selected_window, -XINT (arg), !NILP (side));
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3913
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3914 if (! NILP (Vwindow_configuration_change_hook))
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3915 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
3916
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3917 return Qnil;
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 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921 window_height (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3922 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924 register struct window *p = XWINDOW (window);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3925 return WINDOW_TOTAL_LINES (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3926 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3927
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3928 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3929 window_width (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3930 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3931 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3932 register struct window *p = XWINDOW (window);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3933 return WINDOW_TOTAL_COLS (p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3934 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3935
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3936
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3937 #define CURBEG(w) \
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3938 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3939
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3940 #define CURSIZE(w) \
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3941 *(horiz_flag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3942
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3943
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3944 /* Enlarge WINDOW by DELTA.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3945 HORIZ_FLAG nonzero means enlarge it horizontally;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3946 zero means do it vertically.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3947
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3948 Siblings of the selected window are resized to fulfill the size
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3949 request. If they become too small in the process, they will be
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3950 deleted. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3951
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
3952 static void
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3953 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
3954 Lisp_Object window;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3955 int delta, horiz_flag;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 {
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
3957 Lisp_Object parent, next, prev;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3958 struct window *p;
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
3959 Lisp_Object *sizep;
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
3960 int maximum;
20351
f69eb2ab4f0f Add prototypes.
Andreas Schwab <schwab@suse.de>
parents: 20090
diff changeset
3961 int (*sizefun) P_ ((Lisp_Object))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3962 = horiz_flag ? window_width : window_height;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3963 void (*setsizefun) P_ ((Lisp_Object, int, int))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3964 = (horiz_flag ? set_window_width : set_window_height);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3965
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3966 /* Check values of window_min_width and window_min_height for
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3967 validity. */
972
f47d221cbfe6 * window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents: 780
diff changeset
3968 check_min_window_sizes ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3969
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3970 /* Give up if this window cannot be resized. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3971 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
3972 error ("Window is not resizable");
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3973
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3974 /* Find the parent of the selected window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3975 while (1)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3976 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3977 p = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3978 parent = p->parent;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3979
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3980 if (NILP (parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3981 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3982 if (horiz_flag)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3983 error ("No other window to side of this one");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3984 break;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3985 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3986
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
3987 if (horiz_flag
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
3988 ? !NILP (XWINDOW (parent)->hchild)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
3989 : !NILP (XWINDOW (parent)->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3990 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
3991
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3992 window = parent;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3993 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3994
1049
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
3995 sizep = &CURSIZE (window);
25046e48ce9a * window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents: 1016
diff changeset
3996
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3997 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3998 register int maxdelta;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3999
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4000 /* 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
4001
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4002 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4003 /* This is a main window followed by a minibuffer. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4004 : !NILP (p->next) ? ((*sizefun) (p->next)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4005 - window_min_size (XWINDOW (p->next),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4006 horiz_flag, 0, 0))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4007 /* This is a minibuffer following a main window. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4008 : !NILP (p->prev) ? ((*sizefun) (p->prev)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4009 - window_min_size (XWINDOW (p->prev),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4010 horiz_flag, 0, 0))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4011 /* This is a frame with only one window, a minibuffer-only
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4012 or a minibufferless frame. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4013 : (delta = 0));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4014
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4015 if (delta > maxdelta)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4016 /* This case traps trying to make the minibuffer
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4017 the full frame, or make the only window aside from the
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
4018 minibuffer the full frame. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4019 delta = maxdelta;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4020 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4021
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4022 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), horiz_flag, 0, 0))
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4023 {
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
4024 delete_window (window);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
4025 return;
7618
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4026 }
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4027
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4028 if (delta == 0)
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4029 return;
45298374e242 (change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents: 7545
diff changeset
4030
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4031 /* 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
4032 maximum = 0;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4033 for (next = p->next; ! NILP (next); next = XWINDOW (next)->next)
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4034 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next),
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4035 horiz_flag, 0, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4036 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4037 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4038 horiz_flag, 0, 0);
42308
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4039
c931d7a1b0df (enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 42089
diff changeset
4040 /* 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
4041 if (delta <= maximum)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4042 {
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4043 Lisp_Object first_unaffected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4044 Lisp_Object first_affected;
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4045 int fixed_p;
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4046
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4047 next = p->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4048 prev = p->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4049 first_affected = window;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4050 /* 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
4051 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
4052 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
4053 while (delta != 0
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4054 && (!NILP (next) || !NILP (prev)))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4055 {
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4056 if (! NILP (next))
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4057 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4058 int this_one = ((*sizefun) (next)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4059 - window_min_size (XWINDOW (next),
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4060 horiz_flag, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4061 if (!fixed_p)
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 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4064 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4065
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4066 (*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
4067 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4068
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4069 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4070 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4071
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4072 next = XWINDOW (next)->next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4073 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4074
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4075 if (delta == 0)
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4076 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4077
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4078 if (! NILP (prev))
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4079 {
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4080 int this_one = ((*sizefun) (prev)
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4081 - window_min_size (XWINDOW (prev),
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4082 horiz_flag, 0, &fixed_p));
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4083 if (!fixed_p)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4084 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4085 if (this_one > delta)
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4086 this_one = delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4087
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4088 first_affected = prev;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4089
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4090 (*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
4091 (*setsizefun) (window, XINT (*sizep) + this_one, 0);
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4092
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4093 delta -= this_one;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4094 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4095
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4096 prev = XWINDOW (prev)->prev;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4097 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4098 }
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4099
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4100 xassert (delta == 0);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4101
16982
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4102 /* 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
4103 based on the new sizes. */
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4104 first_unaffected = next;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4105 prev = first_affected;
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4106 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
4107 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
4108 {
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4109 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
4110 /* 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
4111 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
4112 (*setsizefun) (next, (*sizefun) (next), 0);
8516fb50f3e5 (change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents: 16980
diff changeset
4113 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4114 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4115 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4116 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4117 register int delta1;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4118 register int opht = (*sizefun) (parent);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4119
28463
4591d285fb65 * window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents: 28417
diff changeset
4120 if (opht <= XINT (*sizep) + delta)
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4121 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4122 /* 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
4123 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
4124 Lisp_Object start, tem, next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4125
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4126 start = XWINDOW (parent)->vchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4127 if (NILP (start))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4128 start = XWINDOW (parent)->hchild;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4129
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4130 /* 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
4131 tem = XWINDOW (window)->next;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4132 while (! NILP (tem))
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4133 {
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4134 next = XWINDOW (tem)->next;
42862
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4135 delete_window (tem);
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4136 tem = next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4137 }
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4138
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4139 /* 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
4140 Note that if START is not WINDOW, then WINDOW still
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4141 Fhas siblings, so WINDOW has not yet replaced its parent. */
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4142 tem = start;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4143 while (! EQ (tem, window))
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4144 {
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4145 next = XWINDOW (tem)->next;
ca273f84f170 (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents: 42816
diff changeset
4146 delete_window (tem);
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4147 tem = next;
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4148 }
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4149 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4150 else
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4151 {
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4152 /* Otherwise, make delta1 just right so that if we add
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4153 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
4154 shrink the parent back to its original size, the new
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4155 proportional size of this window will increase by delta.
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 The function size_window will compute the new height h'
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4158 of the window from delta1 as:
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 e = delta1/n
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4161 x = delta1 - delta1/n * n for the 1st resizable child
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4162 h' = h + e + x
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4163
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4164 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
4165 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
4166 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
4167
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4168 h' = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4169
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4170 So, delta1 must be
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4171
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4172 h + e = h + delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4173 delta1/n = delta
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4174 delta1 = n * delta.
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4175
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
4176 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
4177 children of this window + 1 because we know window itself
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4178 is resizable (otherwise we would have signalled an error). */
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4179
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4180 struct window *w = XWINDOW (window);
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4181 Lisp_Object s;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4182 int n = 1;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4183
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4184 for (s = w->next; !NILP (s); s = XWINDOW (s)->next)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4185 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
4186 ++n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4187 for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4188 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
4189 ++n;
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4190
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4191 delta1 = n * delta;
42816
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4192
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4193 /* 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
4194 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
4195 XSETINT (CURSIZE (parent), opht + delta1);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4196 (*setsizefun) (window, XINT (*sizep) + delta1, 0);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4197
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4198 /* Squeeze out delta1 lines or columns from our parent,
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4199 shriking this window and siblings proportionately.
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4200 This brings parent back to correct size.
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4201 Delta1 was calculated so this makes this window the desired size,
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4202 taking it all out of the siblings. */
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4203 (*setsizefun) (parent, opht, 0);
3ba600a336b4 (enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents: 42603
diff changeset
4204
25268
ae698a1c13a4 (Qfixed_window_size): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25255
diff changeset
4205 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4206 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4207
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
4208 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
4209 XSETFASTINT (p->last_overlay_modified, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4210
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4211 /* Adjust glyph matrices. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4212 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4213 }
25254
518d62d71d21 (MINSIZE): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25182
diff changeset
4214
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4215
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4216 /* Adjust the size of WINDOW by DELTA, moving only its trailing edge.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4217 HORIZ_FLAG nonzero means adjust the width, moving the right edge.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4218 zero means adjust the height, moving the bottom edge.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4219
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4220 Following siblings of the selected window are resized to fulfill
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4221 the size request. If they become too small in the process, they
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4222 are not deleted; instead, we signal an error. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4223
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4224 static void
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4225 adjust_window_trailing_edge (window, delta, horiz_flag)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4226 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4227 int delta, horiz_flag;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4228 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4229 Lisp_Object parent, child;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4230 struct window *p;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4231 Lisp_Object old_config = Fcurrent_window_configuration (Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4232 int delcount = window_deletion_count;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4233
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4234 /* Check values of window_min_width and window_min_height for
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4235 validity. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4236 check_min_window_sizes ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4237
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4238 if (NILP (window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4239 window = Fselected_window ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4240
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4241 CHECK_WINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4242
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4243 /* Give up if this window cannot be resized. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4244 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4245 error ("Window is not resizable");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4246
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4247 while (1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4248 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4249 p = XWINDOW (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4250 parent = p->parent;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4251
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4252 /* Make sure there is a following window. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4253 if (NILP (parent)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4254 && (horiz_flag ? 1
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4255 : NILP (XWINDOW (window)->next)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4256 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4257 Fset_window_configuration (old_config);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4258 error ("No other window following this one");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4259 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4260
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4261 /* Don't make this window too small. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4262 if (XINT (CURSIZE (window)) + delta
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4263 < (horiz_flag ? window_min_width : window_min_height))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4264 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4265 Fset_window_configuration (old_config);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4266 error ("Cannot adjust window size as specified");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4267 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4268
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4269 /* Clear out some redisplay caches. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4270 XSETFASTINT (p->last_modified, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4271 XSETFASTINT (p->last_overlay_modified, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4272
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4273 /* Adjust this window's edge. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4274 XSETINT (CURSIZE (window),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4275 XINT (CURSIZE (window)) + delta);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4276
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4277 /* If this window has following siblings in the desired dimension,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4278 make them smaller.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4279 (If we reach the top of the tree and can never do this,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4280 we will fail and report an error, above.) */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4281 if (horiz_flag
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4282 ? !NILP (XWINDOW (parent)->hchild)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4283 : !NILP (XWINDOW (parent)->vchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4284 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4285 if (!NILP (XWINDOW (window)->next))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4286 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4287 XSETINT (CURBEG (p->next),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4288 XINT (CURBEG (p->next)) + delta);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4289 size_window (p->next, XINT (CURSIZE (p->next)) - delta,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4290 horiz_flag, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4291 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4292 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4293 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4294 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4295 /* Here we have a chain of parallel siblings, in the other dimension.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4296 Change the size of the other siblings. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4297 for (child = (horiz_flag
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4298 ? XWINDOW (parent)->vchild
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4299 : XWINDOW (parent)->hchild);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4300 ! NILP (child);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4301 child = XWINDOW (child)->next)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4302 if (! EQ (child, window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4303 size_window (child, XINT (CURSIZE (child)) + delta,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4304 horiz_flag, 0);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4305
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4306 window = parent;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4307 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4308
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4309 /* If we made a window so small it got deleted,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4310 we failed. Report failure. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4311 if (delcount != window_deletion_count)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4312 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4313 Fset_window_configuration (old_config);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4314 error ("Cannot adjust window size as specified");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4315 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4316
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4317 /* Adjust glyph matrices. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4318 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4319 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4320
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4321 #undef CURBEG
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4322 #undef CURSIZE
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4323
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4324 DEFUN ("adjust-window-trailing-edge", Fadjust_window_trailing_edge,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4325 Sadjust_window_trailing_edge, 3, 3, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4326 doc: /* Adjust the bottom or right edge of WINDOW by DELTA.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4327 If HORIZONTAL is non-nil, that means adjust the width, moving the right edge.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4328 Otherwise, adjust the height, moving the bottom edge.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4329
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4330 Following siblings of the selected window are resized to fulfill
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4331 the size request. If they become too small in the process, they
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4332 are not deleted; instead, we signal an error. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4333 (window, delta, horizontal)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4334 Lisp_Object window, delta, horizontal;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4335 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4336 CHECK_NUMBER (delta);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4337 adjust_window_trailing_edge (window, XINT (delta), !NILP (horizontal));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4338
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4339 if (! NILP (Vwindow_configuration_change_hook))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4340 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4341
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4342 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4343 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4344
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4345
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4346
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4347 /***********************************************************************
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4348 Resizing Mini-Windows
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4349 ***********************************************************************/
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4350
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4351 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
4352
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4353 enum save_restore_action
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4354 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4355 CHECK_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4356 SAVE_ORIG_SIZES,
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4357 RESTORE_ORIG_SIZES
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4358 };
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4359
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4360 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
4361 enum save_restore_action));
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4362
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4363 /* 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
4364 from lowest windows first. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4365
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4366 static void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4367 shrink_window_lowest_first (w, height)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4368 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4369 int height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4370 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4371 struct window *c;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4372 Lisp_Object child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4373 int old_height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4374
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4375 xassert (!MINI_WINDOW_P (w));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4376
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4377 /* Set redisplay hints. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4378 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4379 XSETFASTINT (w->last_overlay_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4380 windows_or_buffers_changed++;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4381 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
4382
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4383 old_height = XFASTINT (w->total_lines);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4384 XSETFASTINT (w->total_lines, height);
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4385
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4386 if (!NILP (w->hchild))
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4387 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4388 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
4389 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4390 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4391 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
4392 shrink_window_lowest_first (c, height);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4393 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4394 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4395 else if (!NILP (w->vchild))
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4396 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4397 Lisp_Object last_child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4398 int delta = old_height - height;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4399 int last_top;
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4400
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31393
diff changeset
4401 last_child = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4402
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4403 /* 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
4404 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
4405 backwards. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4406 for (child = w->vchild; !NILP (child); child = XWINDOW (child)->next)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4407 last_child = child;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4408
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4409 /* Assign new heights. We leave only MIN_SAFE_WINDOW_HEIGHT. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4410 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
4411 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4412 int this_one;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4413
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4414 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4415 this_one = XFASTINT (c->total_lines) - MIN_SAFE_WINDOW_HEIGHT;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4416
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4417 if (this_one > delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4418 this_one = delta;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4419
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4420 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
4421 delta -= this_one;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4422 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4423
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4424 /* Compute new positions. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4425 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
4426 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
4427 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4428 c = XWINDOW (child);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4429 c->top_line = make_number (last_top);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4430 shrink_window_lowest_first (c, XFASTINT (c->total_lines));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4431 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
4432 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4433 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4434 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4435
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4436
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4437 /* 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
4438 rooted at W. ACTION says what to do.
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4439
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4440 If ACTION is CHECK_ORIG_SIZES, check if orig_top_line and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4441 orig_total_lines members are valid for all windows in the window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4442 tree. Value is non-zero if they are valid.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4443
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4444 If ACTION is SAVE_ORIG_SIZES, save members top and height in
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4445 orig_top_line and orig_total_lines for all windows in the tree.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4446
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4447 If ACTION is RESTORE_ORIG_SIZES, restore top and height from values
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4448 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
4449
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4450 static int
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4451 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
4452 struct window *w;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4453 enum save_restore_action action;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4454 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4455 int success_p = 1;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4456
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4457 while (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4458 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4459 if (!NILP (w->hchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4460 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4461 if (!save_restore_orig_size (XWINDOW (w->hchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4462 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4463 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4464 else if (!NILP (w->vchild))
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4465 {
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4466 if (!save_restore_orig_size (XWINDOW (w->vchild), action))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4467 success_p = 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4468 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4469
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4470 switch (action)
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4471 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4472 case CHECK_ORIG_SIZES:
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4473 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
4474 return 0;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4475 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4476
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4477 case SAVE_ORIG_SIZES:
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4478 w->orig_top_line = w->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4479 w->orig_total_lines = w->total_lines;
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4480 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4481 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4482 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4483
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4484 case RESTORE_ORIG_SIZES:
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4485 xassert (INTEGERP (w->orig_top_line) && INTEGERP (w->orig_total_lines));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4486 w->top_line = w->orig_top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4487 w->total_lines = w->orig_total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4488 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
4489 XSETFASTINT (w->last_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4490 XSETFASTINT (w->last_overlay_modified, 0);
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4491 break;
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4492
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4493 default:
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4494 abort ();
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4495 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4496
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4497 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
4498 }
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4499
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4500 return success_p;
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4501 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4502
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4503
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4504 /* 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
4505 without deleting other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4506
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4507 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4508 grow_mini_window (w, delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4509 struct window *w;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4510 int delta;
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 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4513 struct window *root;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4514
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4515 xassert (MINI_WINDOW_P (w));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4516 xassert (delta >= 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4517
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4518 /* Check values of window_min_width and window_min_height for
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4519 validity. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4520 check_min_window_sizes ();
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4521
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4522 /* 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
4523 other windows. */
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4524 root = XWINDOW (FRAME_ROOT_WINDOW (f));
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4525 if (delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4526 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4527 int min_height = window_min_size (root, 0, 0, 0);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4528 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
4529 /* 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
4530 min_height. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4531 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
4532 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4533
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4534 if (delta)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4535 {
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4536 /* 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
4537 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES))
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4538 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
4539
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4540 /* Shrink other windows. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4541 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
4542
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4543 /* Grow the mini-window. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4544 w->top_line = make_number (XFASTINT (root->top_line) + XFASTINT (root->total_lines));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4545 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
4546 XSETFASTINT (w->last_modified, 0);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4547 XSETFASTINT (w->last_overlay_modified, 0);
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 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4550 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4551 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4552
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4553
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4554 /* 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
4555 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
4556 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
4557 line. */
25792
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 void
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4560 shrink_mini_window (w)
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4561 struct window *w;
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 struct frame *f = XFRAME (w->frame);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4564 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
4565
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4566 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
4567 {
26046
9204dfa34c1b (enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25797
diff changeset
4568 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
4569 adjust_glyphs (f);
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4570 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4571 windows_or_buffers_changed = 1;
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4572 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4573 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
4574 {
35621
5f154b8fc2bd (size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents: 35483
diff changeset
4575 /* 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
4576 among the other windows. */
25797
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4577 Lisp_Object window;
0d73a1e7b7f2 (enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents: 25792
diff changeset
4578 XSETWINDOW (window, w);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4579 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
4580 }
25792
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4581 }
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4582
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4583
80e84cb91f1e (window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25739
diff changeset
4584
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4585 /* 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
4586 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
4587 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
4588 the frame are cleared. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4589
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4590 void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4591 mark_window_cursors_off (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4592 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4593 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4594 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4595 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4596 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4597 mark_window_cursors_off (XWINDOW (w->hchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4598 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4599 mark_window_cursors_off (XWINDOW (w->vchild));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4600 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4601 w->phys_cursor_on_p = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4602
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4603 w = NILP (w->next) ? 0 : XWINDOW (w->next);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4604 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4605 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4606
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4607
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4608 /* Return number of lines of text (not counting mode lines) in W. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4609
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4610 int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4611 window_internal_height (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4612 struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4613 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4614 int ht = XFASTINT (w->total_lines);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4615
37270
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4616 if (!MINI_WINDOW_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4617 {
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4618 if (!NILP (w->parent)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4619 || !NILP (w->vchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4620 || !NILP (w->hchild)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4621 || !NILP (w->next)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4622 || !NILP (w->prev)
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4623 || WINDOW_WANTS_MODELINE_P (w))
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4624 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4625
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4626 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
4627 --ht;
9bf32a648127 (window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents: 36809
diff changeset
4628 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4629
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4630 return ht;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4631 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4632
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4633
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4634 /* 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
4635 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
4636 separating W from the sibling to its right. */
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4637
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4638 int
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4639 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
4640 struct window *w;
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4641 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4642 struct frame *f = XFRAME (WINDOW_FRAME (w));
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4643 int width = XINT (w->total_cols);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4644
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4645 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4646 /* Scroll bars occupy a few columns. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4647 width -= WINDOW_CONFIG_SCROLL_BAR_COLS (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4648 else if (!FRAME_WINDOW_P (f)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4649 && !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
4650 /* The column of `|' characters separating side-by-side windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4651 occupies one column only. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4652 width -= 1;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4653
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4654 if (FRAME_WINDOW_P (f))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4655 /* On window-systems, fringes and display margins cannot be
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4656 used for normal text. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4657 width -= (WINDOW_FRINGE_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4658 + WINDOW_LEFT_MARGIN_COLS (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4659 + 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
4660
701db778b7a4 (Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents: 16208
diff changeset
4661 return width;
1783
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4662 }
8e7932110418 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1716
diff changeset
4663
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4664
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4665 /************************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4666 Window Scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4667 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4668
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4669 /* 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
4670 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
4671 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
4672 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
4673 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
4674 respectively. */
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4675
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4676 static void
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4677 window_scroll (window, n, whole, noerror)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4678 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4679 int n;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
4680 int whole;
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
4681 int noerror;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4682 {
47865
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4683 immediate_quit = 1;
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4684
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4685 /* 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
4686 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
4687 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame)))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4688 window_scroll_pixel_based (window, n, whole, noerror);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4689 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4690 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
4691
22b1643144e9 (window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents: 47567
diff changeset
4692 immediate_quit = 0;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4693 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4694
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4695
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4696 /* 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
4697 heights. See the comment of window_scroll for parameter
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4698 descriptions. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4699
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4700 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4701 window_scroll_pixel_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4702 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4703 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4704 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4705 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4706 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4707 struct it it;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4708 struct window *w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4709 struct text_pos start;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4710 Lisp_Object tem;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4711 int this_scroll_margin;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4712 int preserve_y;
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4713 /* True if we fiddled the window vscroll field without really scrolling. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4714 int vscrolled = 0;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4715
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4716 SET_TEXT_POS_FROM_MARKER (start, w->start);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4717
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4718 /* 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
4719 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
4720 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
4721 the partially visible one would recenter. */
a6f5dfd3e5f4 (window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents: 38722
diff changeset
4722 tem = Fpos_visible_in_window_p (make_number (PT), window, Qt);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4723 if (NILP (tem))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4724 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4725 /* 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
4726 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
4727 results for variable height lines. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4728 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
4729 it.current_y = it.last_visible_y;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4730 move_it_vertically_backward (&it, window_box_height (w) / 2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4731
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4732 /* 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
4733 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
4734 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
4735 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
4736 start of the line containing PT in this case. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4737 if (it.current_y <= 0)
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 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4740 move_it_vertically_backward (&it, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4741 it.current_y = 0;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4742 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4743
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4744 start = it.current.pos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4745 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4746 else if (auto_window_vscroll_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4747 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4748 if (tem = XCAR (XCDR (XCDR (tem))), CONSP (tem))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4749 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4750 int px;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4751 int dy = WINDOW_FRAME_LINE_HEIGHT (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4752 if (whole)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4753 dy = max ((window_box_height (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4754 - next_screen_context_lines * dy),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4755 dy);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4756 dy *= n;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4757
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4758 if (n < 0 && (px = XINT (XCAR (tem))) > 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4759 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4760 px = max (0, -w->vscroll - min (px, -dy));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4761 Fset_window_vscroll (window, make_number (px), Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4762 return;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4763 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4764 if (n > 0 && (px = XINT (XCDR (tem))) > 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4765 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4766 px = max (0, -w->vscroll + min (px, dy));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4767 Fset_window_vscroll (window, make_number (px), Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4768 return;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4769 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4770 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4771 Fset_window_vscroll (window, make_number (0), Qt);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4772 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4773
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4774 /* 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
4775 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
4776 if (!NILP (Vscroll_preserve_screen_position))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4777 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4778 start_display (&it, w, start);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4779 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4780 preserve_y = it.current_y;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4781 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4782 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4783 preserve_y = -1;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4784
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4785 /* 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
4786 backward. The result is the new window start. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4787 start_display (&it, w, start);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4788 if (whole)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4789 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4790 int start_pos = IT_CHARPOS (it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4791 int dy = WINDOW_FRAME_LINE_HEIGHT (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4792 dy = max ((window_box_height (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4793 - next_screen_context_lines * dy),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4794 dy) * n;
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4795
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4796 /* 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
4797 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
4798 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
4799 if (dy <= 0)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4800 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4801 move_it_vertically_backward (&it, -dy);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4802 /* Ensure we actually does move, e.g. in case we are currently
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4803 looking at an image that is taller that the window height. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4804 while (start_pos == IT_CHARPOS (it)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4805 && start_pos > BEGV)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4806 move_it_by_lines (&it, -1, 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4807 }
34717
c794dfe043b6 (window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents: 34640
diff changeset
4808 else if (dy > 0)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4809 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4810 move_it_to (&it, ZV, -1, it.current_y + dy, -1,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4811 MOVE_TO_POS | MOVE_TO_Y);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4812 /* Ensure we actually does move, e.g. in case we are currently
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4813 looking at an image that is taller that the window height. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4814 while (start_pos == IT_CHARPOS (it)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4815 && start_pos < ZV)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4816 move_it_by_lines (&it, 1, 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4817 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4818 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4819 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4820 move_it_by_lines (&it, n, 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4821
49011
594a08370cb3 (window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents: 48945
diff changeset
4822 /* 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
4823 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
4824 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
4825 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
4826 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start)))
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4827 {
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4828 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
4829 {
48945
a96801f68a82 (window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents: 48927
diff changeset
4830 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
4831 && (it.current_y + it.max_ascent + it.max_descent
a96801f68a82 (window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents: 48927
diff changeset
4832 >= it.last_visible_y))
35126
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4833 {
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4834 /* 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
4835 visible. */
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4836 w->vscroll = (it.last_visible_y
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4837 - 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
4838 adjust_glyphs (it.f);
67fa29af4c7b (window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents: 35038
diff changeset
4839 }
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4840 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4841 return;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4842 else
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4843 Fsignal (Qend_of_buffer, Qnil);
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4844 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4845 else
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4846 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4847 if (w->vscroll != 0)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4848 /* 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
4849 visible. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4850 w->vscroll = 0;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4851 else if (noerror)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4852 return;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4853 else
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4854 Fsignal (Qbeginning_of_buffer, Qnil);
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4855 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4856
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4857 /* 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
4858
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4859 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
4860
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4861 /* 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
4862 vscrolled = 1;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4863 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4864
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4865 if (! vscrolled)
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4866 {
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4867 int pos = IT_CHARPOS (it);
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4868 int bytepos;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4869
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4870 /* If in the middle of a multi-glyph character move forward to
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4871 the next character. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4872 if (in_display_vector_p (&it))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4873 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4874 ++pos;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4875 move_it_to (&it, pos, -1, -1, -1, MOVE_TO_POS);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4876 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4877
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4878 /* 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
4879 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
4880 w->buffer);
45562
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4881 bytepos = XMARKER (w->start)->bytepos;
1b62cee42a61 (window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents: 44890
diff changeset
4882 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
4883 ? Qt : Qnil);
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4884 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
4885 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
4886 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
4887 /* 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
4888 window-scroll-functions. */
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4889 w->force_start = Qt;
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4890 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4891
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4892 /* The rest of this function uses current_y in a nonstandard way,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4893 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
4894 it.current_y = it.vpos = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
4895
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4896 /* Move PT out of scroll margins.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4897 This code wants current_y to be zero at the window start position
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4898 even if there is a header line. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4899 this_scroll_margin = max (0, scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4900 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->total_lines) / 4);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4901 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4902
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4903 if (n > 0)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4904 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4905 /* We moved the window start towards ZV, so PT may be now
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4906 in the scroll margin at the top. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4907 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4908 if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4909 && (NILP (Vscroll_preserve_screen_position)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4910 || EQ (Vscroll_preserve_screen_position, Qt)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4911 /* We found PT at a legitimate height. Leave it alone. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4912 ;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4913 else if (preserve_y >= 0)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4914 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4915 /* If we have a header line, take account of it.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4916 This is necessary because we set it.current_y to 0, above. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4917 if (WINDOW_WANTS_HEADER_LINE_P (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4918 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4919
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4920 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4921 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4922 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4923 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4924 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4925 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
4926 {
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
4927 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
4928 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
4929 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
4930 break;
6bcf9f9c10df (window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents: 44155
diff changeset
4931 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4932 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4933 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4934 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4935 else if (n < 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4936 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4937 int charpos, bytepos;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4938 int partial_p;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4939
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4940 /* Save our position, for the preserve_y case. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4941 charpos = IT_CHARPOS (it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4942 bytepos = IT_BYTEPOS (it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4943
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4944 /* We moved the window start towards BEGV, so PT may be now
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4945 in the scroll margin at the bottom. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4946 move_it_to (&it, PT, -1,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4947 (it.last_visible_y - CURRENT_HEADER_LINE_HEIGHT (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4948 - this_scroll_margin - 1),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4949 -1,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4950 MOVE_TO_POS | MOVE_TO_Y);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4951
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4952 /* Save our position, in case it's correct. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4953 charpos = IT_CHARPOS (it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4954 bytepos = IT_BYTEPOS (it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4955
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4956 /* See if point is on a partially visible line at the end. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4957 if (it.what == IT_EOB)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4958 partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4959 else
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4960 {
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4961 move_it_by_lines (&it, 1, 1);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4962 partial_p = it.current_y > it.last_visible_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4963 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4964
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4965 if (charpos == PT && !partial_p
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4966 && (NILP (Vscroll_preserve_screen_position)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4967 || EQ (Vscroll_preserve_screen_position, Qt)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4968 /* We found PT before we found the display margin, so PT is ok. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4969 ;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4970 else if (preserve_y >= 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4971 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4972 SET_TEXT_POS_FROM_MARKER (start, w->start);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4973 start_display (&it, w, start);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4974 #if 0 /* It's wrong to subtract this here
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4975 because we called start_display again
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4976 and did not alter it.current_y this time. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4977
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4978 /* If we have a header line, take account of it. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4979 if (WINDOW_WANTS_HEADER_LINE_P (w))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4980 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4981 #endif
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4982
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4983 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4984 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4985 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4986 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4987 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
4988 if (partial_p)
34381
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4989 /* 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
4990 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
4991 {
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4992 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
4993 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
4994 }
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4995 else
f9d7bc96177b (Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents: 34277
diff changeset
4996 /* 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
4997 SET_PT_BOTH (charpos, bytepos);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4998 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
4999 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5000 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5001
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5002
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5003 /* 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
5004 See the comment of window_scroll for parameter descriptions. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5005
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5006 static void
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5007 window_scroll_line_based (window, n, whole, noerror)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5008 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5009 int n;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5010 int whole;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5011 int noerror;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5012 {
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5013 register struct window *w = XWINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5014 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
5015 register int pos, pos_byte;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5016 register int ht = window_internal_height (w);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5017 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5018 int lose;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5019 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
5020 int startpos;
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5021 struct position posit;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5022 int original_vpos;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5023
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5024 /* 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
5025 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
5026 if (whole)
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5027 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
5028
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5029 startpos = marker_position (w->start);
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5030
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5031 posit = *compute_motion (startpos, 0, 0, 0,
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5032 PT, ht, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5033 -1, XINT (w->hscroll),
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5034 0, w);
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5035 original_vpos = posit.vpos;
13102
960db92441d8 (window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents: 12981
diff changeset
5036
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
5037 XSETFASTINT (tem, PT);
32773
a7fdbf39d4de (window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents: 32752
diff changeset
5038 tem = Fpos_visible_in_window_p (tem, window, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5039
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5040 if (NILP (tem))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5041 {
6341
dfc758dd2b08 (window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents: 6326
diff changeset
5042 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
5043 startpos = PT;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5044 }
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
5045
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
5046 SET_PT (startpos);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5047 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
5048 Fvertical_motion (make_number (n), window);
7347
3a677a303d5b Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 7080
diff changeset
5049 pos = PT;
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5050 pos_byte = PT_BYTE;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5051 bolp = Fbolp ();
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5052 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5053
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5054 if (lose)
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5055 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5056 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5057 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5058 else
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5059 Fsignal (Qbeginning_of_buffer, Qnil);
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5060 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5061
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5062 if (pos < ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5063 {
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5064 int this_scroll_margin = scroll_margin;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5065
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5066 /* 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
5067 if (this_scroll_margin < 0)
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5068 this_scroll_margin = 0;
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5069
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5070 if (XINT (w->total_lines) < 4 * scroll_margin)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5071 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
5072
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5073 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5074 w->start_at_line_beg = bolp;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5075 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
5076 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
5077 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
5078 /* 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
5079 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
5080 w->force_start = Qt;
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5081
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5082 if (!NILP (Vscroll_preserve_screen_position)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5083 && (whole || !EQ (Vscroll_preserve_screen_position, Qt)))
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5084 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5085 SET_PT_BOTH (pos, pos_byte);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5086 Fvertical_motion (make_number (original_vpos), window);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5087 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5088 /* 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
5089 that it is outside the scroll margin. */
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5090 else if (n > 0)
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5091 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5092 int top_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5093
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5094 if (this_scroll_margin > 0)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5095 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5096 SET_PT_BOTH (pos, pos_byte);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5097 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
5098 top_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5099 }
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5100 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5101 top_margin = pos;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5102
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5103 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
5104 SET_PT_BOTH (opoint, opoint_byte);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5105 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
5106 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5107 SET_PT_BOTH (pos, pos_byte);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5108 Fvertical_motion (make_number (original_vpos), window);
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5109 }
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5110 else
20046
8baac8399a29 (window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents: 19667
diff changeset
5111 SET_PT (top_margin);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5112 }
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5113 else if (n < 0)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5114 {
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5115 int bottom_margin;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5116
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5117 /* 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
5118 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
5119 SET_PT_BOTH (pos, pos_byte);
16559
d62b7f309f2b (window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents: 16555
diff changeset
5120 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
5121 if (XFASTINT (tem) == ht - this_scroll_margin)
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5122 bottom_margin = PT;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5123 else
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5124 bottom_margin = PT + 1;
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5125
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5126 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
5127 SET_PT_BOTH (opoint, opoint_byte);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5128 else
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5129 {
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5130 if (!NILP (Vscroll_preserve_screen_position))
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5131 {
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5132 SET_PT_BOTH (pos, pos_byte);
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5133 Fvertical_motion (make_number (original_vpos), window);
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5134 }
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5135 else
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
5136 Fvertical_motion (make_number (-1), window);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5137 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5138 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5139 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5140 else
522
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5141 {
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5142 if (noerror)
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5143 return;
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5144 else
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5145 Fsignal (Qend_of_buffer, Qnil);
bacdab90fa8b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
5146 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5147 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5148
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5149
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5150 /* 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
5151 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
5152 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
5153 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
5154 up. This is the guts of Fscroll_up and Fscroll_down. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5155
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5156 static void
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5157 scroll_command (n, direction)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5158 Lisp_Object n;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5159 int direction;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5160 {
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5161 int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5162
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5163 xassert (abs (direction) == 1);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5164
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5165 /* 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
5166 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
5167 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5168 {
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5169 record_unwind_protect (save_excursion_restore, save_excursion_save ());
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5170 Fset_buffer (XWINDOW (selected_window)->buffer);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5171
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5172 /* Make redisplay consider other windows than just selected_window. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5173 ++windows_or_buffers_changed;
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5174 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5175
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5176 if (NILP (n))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5177 window_scroll (selected_window, direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5178 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
5179 window_scroll (selected_window, -direction, 1, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5180 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5181 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5182 n = Fprefix_numeric_value (n);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5183 window_scroll (selected_window, XINT (n) * direction, 0, 0);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5184 }
548
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5185
a7b7b759f694 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 522
diff changeset
5186 unbind_to (count, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5187 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5188
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5189 DEFUN ("scroll-up", Fscroll_up, Sscroll_up, 0, 1, "P",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5190 doc: /* Scroll text of current window upward ARG lines.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5191 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
5192 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
5193 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
5194 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
5195 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
5196 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5197 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5198 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5199 scroll_command (arg, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5200 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5201 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5202
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5203 DEFUN ("scroll-down", Fscroll_down, Sscroll_down, 0, 1, "P",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5204 doc: /* Scroll text of current window down ARG lines.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5205 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
5206 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
5207 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
5208 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
5209 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
5210 (arg)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5211 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5212 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5213 scroll_command (arg, -1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5214 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5215 }
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5216
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5217 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
5218 doc: /* Return the other window for \"other window scroll\" commands.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5219 If `other-window-scroll-buffer' is non-nil, a window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5220 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
5221 If in the minibuffer, `minibuffer-scroll-window' if non-nil
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5222 specifies the window. This takes precedence over
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5223 `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
5224 ()
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5225 {
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5226 Lisp_Object window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5227
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5228 if (MINI_WINDOW_P (XWINDOW (selected_window))
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5229 && !NILP (Vminibuf_scroll_window))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5230 window = Vminibuf_scroll_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5231 /* If buffer is specified, scroll that buffer. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5232 else if (!NILP (Vother_window_scroll_buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5233 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5234 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5235 if (NILP (window))
20867
fccf74829150 (Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 20777
diff changeset
5236 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5237 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5238 else
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5239 {
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5240 /* 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
5241 frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5242 window = Fnext_window (selected_window, Qnil, Qnil);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5243
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5244 if (EQ (window, selected_window))
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5245 /* 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
5246 visible frame. */
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5247 do
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5248 window = Fnext_window (window, Qnil, Qt);
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5249 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
5250 && ! EQ (window, selected_window));
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5251 }
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1805
diff changeset
5252
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5253 CHECK_LIVE_WINDOW (window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5254
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5255 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5256 error ("There is no other window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5257
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5258 return window;
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5259 }
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5260
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5261 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
5262 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
5263 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
5264 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
5265 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
5266 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
5267 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
5268
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5269 If `other-window-scroll-buffer' is non-nil, scroll the window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5270 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
5271 If in the minibuffer, `minibuffer-scroll-window' if non-nil
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5272 specifies the window to scroll. This takes precedence over
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5273 `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
5274 (arg)
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5275 Lisp_Object arg;
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5276 {
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5277 Lisp_Object window;
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5278 struct window *w;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46271
diff changeset
5279 int count = SPECPDL_INDEX ();
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5280
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
5281 window = Fother_window_for_scrolling ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5282 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5283
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5284 /* Don't screw up if window_scroll gets an error. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5285 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
5286 ++windows_or_buffers_changed;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5287
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5288 Fset_buffer (w->buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5289 SET_PT (marker_position (w->pointm));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5290
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5291 if (NILP (arg))
37307
f028d889de06 (window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents: 37305
diff changeset
5292 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
5293 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
5294 window_scroll (window, -1, 1, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5295 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5296 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5297 if (CONSP (arg))
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5298 arg = Fcar (arg);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
5299 CHECK_NUMBER (arg);
16751
d393cbcfb69c (window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents: 16658
diff changeset
5300 window_scroll (window, XINT (arg), 0, 1);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5301 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5302
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5303 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
5304 unbind_to (count, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5305
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5306 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5307 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5308
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5309 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
5310 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
5311 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5312 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
5313 effect after the change.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5314 If SET_MINIMUM is non-nil, the new scroll amount becomes the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5315 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
5316 will not scroll a window to a column less than the value returned
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5317 by this function. This happens in an interactive call. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5318 (arg, set_minimum)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5319 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5320 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5321 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5322 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5323 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5324
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5325 if (NILP (arg))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5326 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5327 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5328 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5329
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5330 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
5331 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
5332
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5333 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
5334 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
5335
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5336 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5337 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5338
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5339 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
5340 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
5341 Default for ARG is window width minus 2.
34107437eb4d (Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 40235
diff changeset
5342 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
5343 effect after the change.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5344 If SET_MINIMUM is non-nil, the new scroll amount becomes the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5345 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
5346 will not scroll a window to a column less than the value returned
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5347 by this function. This happens in an interactive call. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5348 (arg, set_minimum)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5349 register Lisp_Object arg, set_minimum;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5350 {
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5351 Lisp_Object result;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5352 int hscroll;
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5353 struct window *w = XWINDOW (selected_window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5354
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5355 if (NILP (arg))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5356 XSETFASTINT (arg, window_box_text_cols (w) - 2);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5357 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5358 arg = Fprefix_numeric_value (arg);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5359
35341
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5360 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
5361 result = Fset_window_hscroll (selected_window, make_number (hscroll));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5362
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5363 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
5364 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
5365
f3eb82d93802 (Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 35126
diff changeset
5366 return result;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5369 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
5370 doc: /* Return the window which was selected when entering the minibuffer.
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5371 Returns nil, if current window is not a minibuffer window. */)
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5372 ()
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5373 {
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5374 if (minibuf_level > 0
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5375 && MINI_WINDOW_P (XWINDOW (selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5376 && WINDOW_LIVE_P (minibuf_selected_window))
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5377 return minibuf_selected_window;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5378
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5379 return Qnil;
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5380 }
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
5381
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5382 /* 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
5383 as opposed to its height. */
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5384
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5385 static int
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5386 displayed_window_lines (w)
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5387 struct window *w;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5388 {
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5389 struct it it;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5390 struct text_pos start;
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5391 int height = window_box_height (w);
33059
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5392 struct buffer *old_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5393 int bottom_y;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5394
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5395 if (XBUFFER (w->buffer) != current_buffer)
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5396 {
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5397 old_buffer = current_buffer;
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5398 set_buffer_internal (XBUFFER (w->buffer));
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5399 }
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5400 else
8fab1b57781b (displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32937
diff changeset
5401 old_buffer = NULL;
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5402
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5403 /* 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
5404 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
5405 calls (recenter -1) while W->start is 1. */
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5406 if (XMARKER (w->start)->charpos < BEGV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5407 SET_TEXT_POS (start, BEGV, BEGV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5408 else if (XMARKER (w->start)->charpos > ZV)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5409 SET_TEXT_POS (start, ZV, ZV_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5410 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5411 SET_TEXT_POS_FROM_MARKER (start, w->start);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5412
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5413 start_display (&it, w, start);
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5414 move_it_vertically (&it, height);
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5415 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
5416
47234
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5417 /* 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
5418 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
5419 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
5420 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
5421 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
5422 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
5423 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
5424 height++;
ca48173ebf57 (displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents: 46410
diff changeset
5425
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5426 /* 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
5427 if (bottom_y < height)
29488
4eef390d6155 (displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents: 29485
diff changeset
5428 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5429 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
5430 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
5431 }
34384
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5432
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5433 if (old_buffer)
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5434 set_buffer_internal (old_buffer);
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5435
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5436 return it.vpos;
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5437 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5438
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5439
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5440 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5441 doc: /* Center point in window and redisplay frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5442 With prefix argument ARG, recenter putting point on screen line ARG
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5443 relative to the current window. If ARG is negative, it counts up from the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5444 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
5445
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5446 If ARG is omitted or nil, erase the entire frame and then
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5447 redraw with point in the center of the current window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5448 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
5449 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
5450 (arg)
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5451 register Lisp_Object arg;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5452 {
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5453 struct window *w = XWINDOW (selected_window);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5454 struct buffer *buf = XBUFFER (w->buffer);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5455 struct buffer *obuf = current_buffer;
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5456 int center_p = 0;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5457 int charpos, bytepos;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5458 int iarg;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5459 int this_scroll_margin;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5460
42089
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5461 /* 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
5462 obuf->display_error_modiff = 0;
ca7101bea5ee (Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents: 41980
diff changeset
5463
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5464 if (NILP (arg))
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5465 {
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5466 int i;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5467
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5468 /* Invalidate pixel data calculated for all compositions. */
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5469 for (i = 0; i < n_compositions; i++)
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5470 composition_table[i]->font = NULL;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5471
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5472 Fredraw_frame (w->frame);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5473 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w)));
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5474 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5475 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5476 else if (CONSP (arg)) /* Just C-u. */
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5477 center_p = 1;
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5478 else
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5479 {
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5480 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
5481 CHECK_NUMBER (arg);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5482 iarg = XINT (arg);
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5483 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5484
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5485 set_buffer_internal (buf);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5486
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5487 /* Do this after making BUF current
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5488 in case scroll_margin is buffer-local. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5489 this_scroll_margin = max (0, scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5490 this_scroll_margin = min (this_scroll_margin,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5491 XFASTINT (w->total_lines) / 4);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5492
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5493 /* 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
5494 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
5495 line counts would lead to strange effects. */
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5496 if (FRAME_WINDOW_P (XFRAME (w->frame)))
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5497 {
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5498 if (center_p)
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5499 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5500 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5501 struct text_pos pt;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5502
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5503 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5504 start_display (&it, w, pt);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5505 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
5506 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5507 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5508 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5509 else if (iarg < 0)
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5510 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5511 struct it it;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5512 struct text_pos pt;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5513 int nlines = -iarg;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5514 int extra_line_spacing;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5515 int h = window_box_height (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5516
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5517 iarg = - max (-iarg, this_scroll_margin);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5518
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5519 SET_TEXT_POS (pt, PT, PT_BYTE);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5520 start_display (&it, w, pt);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5521
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5522 /* Be sure we have the exact height of the full line containing PT. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5523 move_it_by_lines (&it, 0, 1);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5524
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5525 /* 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
5526 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
5527 and the lines below. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5528 it.current_y = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5529 it.vpos = 0;
38722
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5530 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
5531
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5532 if (it.vpos == nlines)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5533 h -= it.current_y;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5534 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5535 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5536 /* Last line has no newline */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5537 h -= line_bottom_y (&it);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5538 it.vpos++;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5539 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5540
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5541 /* Don't reserve space for extra line spacing of last line. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5542 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
5543
b1f9c6a7a002 (Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents: 37307
diff changeset
5544 /* 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
5545 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
5546 if (it.vpos < nlines)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5547 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5548 nlines -= it.vpos;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5549 extra_line_spacing = it.extra_line_spacing;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5550 h -= nlines * (FRAME_LINE_HEIGHT (it.f) + extra_line_spacing);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5551 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5552 if (h <= 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5553 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5554
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5555 /* 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
5556 start_display (&it, w, pt);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5557 it.current_y = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5558 move_it_vertically_backward (&it, h);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5559
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5560 /* If extra line spacing is present, we may move too far
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5561 back. This causes the last line to be only partially
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5562 visible (which triggers redisplay to recenter that line
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5563 in the middle), so move forward.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5564 But ignore extra line spacing on last line, as it is not
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5565 considered to be part of the visible height of the line.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5566 */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5567 h += extra_line_spacing;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5568 while (-it.current_y > h)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5569 move_it_by_lines (&it, 1, 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5570
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5571 charpos = IT_CHARPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5572 bytepos = IT_BYTEPOS (it);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5573 }
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5574 else
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5575 {
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5576 struct position pos;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5577
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5578 iarg = max (iarg, this_scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5579
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5580 pos = *vmotion (PT, -iarg, w);
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5581 charpos = pos.bufpos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5582 bytepos = pos.bytepos;
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5583 }
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5584 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5585 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5586 {
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5587 struct position pos;
36635
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5588 int ht = window_internal_height (w);
f85346ef86be (Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents: 36471
diff changeset
5589
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5590 if (center_p)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5591 iarg = ht / 2;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5592 else if (iarg < 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5593 iarg += ht;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5594
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5595 /* Don't let it get into the margin at either top or bottom. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5596 iarg = max (iarg, this_scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5597 iarg = min (iarg, ht - this_scroll_margin - 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5598
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5599 pos = *vmotion (PT, - iarg, w);
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5600 charpos = pos.bufpos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5601 bytepos = pos.bytepos;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5602 }
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5603
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5604 /* Set the new window start. */
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5605 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
5606 w->window_end_valid = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5607
46108
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5608 w->optional_new_start = Qt;
7b8b4ec9573c (Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 46021
diff changeset
5609
34991
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5610 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
5611 w->start_at_line_beg = Qt;
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5612 else
ad94ea6e6549 (Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents: 34986
diff changeset
5613 w->start_at_line_beg = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5614
34874
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5615 set_buffer_internal (obuf);
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5616 return Qnil;
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5617 }
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5618
3af71a0ef007 (Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34831
diff changeset
5619
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5620 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
5621 0, 1, 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5622 doc: /* Return the height in lines of the text display area of WINDOW.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5623 This doesn't include the mode-line (or header-line if any) or any
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5624 partial-height lines in the text display area. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5625 (window)
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5626 Lisp_Object window;
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5627 {
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5628 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
5629 int pixel_height = window_box_height (w);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5630 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
5631 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
5632 }
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5633
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
5634
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5635
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5636 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
5637 1, 1, "P",
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
5638 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
5639 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
5640 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
5641 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
5642 (arg)
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5643 Lisp_Object arg;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5644 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5645 struct window *w = XWINDOW (selected_window);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5646 int lines, start;
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5647 Lisp_Object window;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5648 #if 0
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5649 int this_scroll_margin;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5650 #endif
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5651
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5652 window = selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5653 start = marker_position (w->start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5654 if (start < BEGV || start > ZV)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5655 {
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5656 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
5657 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
5658 set_marker_both (w->start, w->buffer, PT, PT_BYTE);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5659 w->start_at_line_beg = Fbolp ();
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5660 w->force_start = Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5661 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5662 else
20535
3094e3fd9764 (unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20351
diff changeset
5663 Fgoto_char (w->start);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5664
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5665 lines = displayed_window_lines (w);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5666
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5667 #if 0
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5668 this_scroll_margin = max (0, scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5669 this_scroll_margin = min (this_scroll_margin, lines / 4);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5670 #endif
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5671
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5672 if (NILP (arg))
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5673 XSETFASTINT (arg, lines / 2);
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5674 else
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5675 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5676 int iarg = XINT (Fprefix_numeric_value (arg));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5677
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5678 if (iarg < 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5679 iarg = iarg + lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5680
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5681 #if 0 /* This code would prevent move-to-window-line from moving point
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5682 to a place inside the scroll margins (which would cause the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5683 next redisplay to scroll). I wrote this code, but then concluded
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5684 it is probably better not to install it. However, it is here
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5685 inside #if 0 so as not to lose it. -- rms. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5686
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5687 /* Don't let it get into the margin at either top or bottom. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5688 iarg = max (iarg, this_scroll_margin);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5689 iarg = min (iarg, lines - this_scroll_margin - 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5690 #endif
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5691
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5692 arg = make_number (iarg);
29485
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5693 }
362c61b5411b (displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28918
diff changeset
5694
36202
8d5b7f742286 (Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 36133
diff changeset
5695 /* 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
5696 if (w->vscroll)
9669bb49fca2 (Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents: 34381
diff changeset
5697 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
5698
6326
5e662ad3f594 (Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents: 6269
diff changeset
5699 return Fvertical_motion (arg, window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5700 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5701
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5702
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5703
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5704 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5705 Window Configuration
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5706 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5707
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5708 struct save_window_data
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5709 {
15712
a272ccf6c225 (struct save_window_data, struct saved_window): First
Karl Heuer <kwzh@gnu.org>
parents: 15385
diff changeset
5710 EMACS_INT size_from_Lisp_Vector_struct;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5711 struct Lisp_Vector *next_from_Lisp_Vector_struct;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5712 Lisp_Object frame_cols, frame_lines, frame_menu_bar_lines;
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
5713 Lisp_Object frame_tool_bar_lines;
1325
f03e559aac3e * window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents: 1280
diff changeset
5714 Lisp_Object selected_frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5715 Lisp_Object current_window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5716 Lisp_Object current_buffer;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5717 Lisp_Object minibuf_scroll_window;
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
5718 Lisp_Object minibuf_selected_window;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5719 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
5720 Lisp_Object focus_frame;
8931
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5721 /* Record the values of window-min-width and window-min-height
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5722 so that window sizes remain consistent with them. */
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5723 Lisp_Object min_width, min_height;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5724 /* 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
5725 for one window. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5726 Lisp_Object saved_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5727 };
1326
709532b86646 * window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents: 1325
diff changeset
5728
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
5729 /* This is saved as a Lisp_Vector */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5730 struct saved_window
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5731 {
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5732 /* these first two must agree with struct Lisp_Vector in lisp.h */
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5733 EMACS_INT size_from_Lisp_Vector_struct;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5734 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
5735
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5736 Lisp_Object window;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5737 Lisp_Object buffer, start, pointm, mark;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5738 Lisp_Object left_col, top_line, total_cols, total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5739 Lisp_Object hscroll, min_hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5740 Lisp_Object parent, prev;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5741 Lisp_Object start_at_line_beg;
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5742 Lisp_Object display_table;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5743 Lisp_Object orig_top_line, orig_total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5744 Lisp_Object left_margin_cols, right_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5745 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5746 Lisp_Object scroll_bar_width, vertical_scroll_bar_type;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5747 };
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5748
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5749 #define SAVED_WINDOW_N(swv,n) \
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5750 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)])))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5751
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5752 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
5753 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
5754 (object)
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5755 Lisp_Object object;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5756 {
14089
415aa106fa17 (Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents: 14027
diff changeset
5757 if (WINDOW_CONFIGURATIONP (object))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5758 return Qt;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5759 return Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5760 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5761
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5762 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
5763 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
5764 (config)
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5765 Lisp_Object config;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5766 {
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5767 register struct save_window_data *data;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5768 struct Lisp_Vector *saved_windows;
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5769
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5770 if (! WINDOW_CONFIGURATIONP (config))
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5771 wrong_type_argument (Qwindow_configuration_p, config);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5772
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5773 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
5774 saved_windows = XVECTOR (data->saved_windows);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5775 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
5776 }
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5777
2297
bb88d48c290f (Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents: 2210
diff changeset
5778 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
5779 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
5780 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
5781 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
5782 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
5783 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
5784 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
5785 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
5786 (configuration)
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
5787 Lisp_Object configuration;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5788 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5789 register struct save_window_data *data;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5790 struct Lisp_Vector *saved_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5791 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
5792 Lisp_Object frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
5793 FRAME_PTR f;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
5794 int old_point = -1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5795
9105
984a4b1be1d1 (Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents: 9028
diff changeset
5796 while (!WINDOW_CONFIGURATIONP (configuration))
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
5797 wrong_type_argument (Qwindow_configuration_p, configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5798
1016
817b0ce337d7 * window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents: 983
diff changeset
5799 data = (struct save_window_data *) XVECTOR (configuration);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5800 saved_windows = XVECTOR (data->saved_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5801
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5802 new_current_buffer = data->current_buffer;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
5803 if (NILP (XBUFFER (new_current_buffer)->name))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5804 new_current_buffer = Qnil;
45835
aab759361c24 (Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents: 45645
diff changeset
5805 else
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5806 {
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5807 if (XBUFFER (new_current_buffer) == current_buffer)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5808 /* The code further down "preserves point" by saving here PT in
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5809 old_point and then setting it later back into PT. When the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5810 current-selected-window and the final-selected-window both show
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5811 the current buffer, this suffers from the problem that the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5812 current PT is the window-point of the current-selected-window,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5813 while the final PT is the point of the final-selected-window, so
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5814 this copy from one PT to the other would end up moving the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5815 window-point of the final-selected-window to the window-point of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5816 the current-selected-window. So we have to be careful which
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5817 point of the current-buffer we copy into old_point. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5818 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5819 && WINDOWP (selected_window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5820 && EQ (XWINDOW (selected_window)->buffer, new_current_buffer)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5821 && !EQ (selected_window, data->current_window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5822 old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5823 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5824 old_point = PT;
48898
3b18ddd398f8 (Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents: 47973
diff changeset
5825 else
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5826 /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5827 point in new_current_buffer as of the last time this buffer was
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5828 used. This can be non-deterministic since it can be changed by
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5829 things like jit-lock by mere temporary selection of some random
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5830 window that happens to show this buffer.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5831 So if possible we want this arbitrary choice of "which point" to
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5832 be the one from the to-be-selected-window so as to prevent this
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5833 window's cursor from being copied from another window. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5834 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5835 /* If current_window = selected_window, its point is in BUF_PT. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5836 && !EQ (selected_window, data->current_window))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5837 old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5838 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5839 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
5840 }
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5841
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5842 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
5843 f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5844
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5845 /* 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
5846 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
5847 if (FRAME_LIVE_P (f))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5848 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5849 register struct window *w;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5850 register struct saved_window *p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5851 struct window *root_window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5852 struct window **leaf_windows;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5853 int n_leaf_windows;
33277
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
5854 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
5855
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5856 /* 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
5857 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
5858 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
5859 back. We keep track of the prevailing height in these variables. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5860 int previous_frame_lines = FRAME_LINES (f);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5861 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
5862 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
5863 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
5864
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
5865 /* The mouse highlighting code could get screwed up
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
5866 if it runs during this. */
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
5867 BLOCK_INPUT;
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
5868
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5869 if (XFASTINT (data->frame_lines) != previous_frame_lines
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5870 || XFASTINT (data->frame_cols) != previous_frame_cols)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5871 change_frame_size (f, XFASTINT (data->frame_lines),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5872 XFASTINT (data->frame_cols), 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
5873 #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
5874 if (XFASTINT (data->frame_menu_bar_lines)
19eaf70457d4 (Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents: 5990
diff changeset
5875 != previous_frame_menu_bar_lines)
21533
b7df83bf15ff (Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
5876 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
5877 #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
5878 if (XFASTINT (data->frame_tool_bar_lines)
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
5879 != 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
5880 x_set_tool_bar_lines (f, data->frame_tool_bar_lines, make_number (0));
6852
5cc78dd8efc3 (Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents: 6851
diff changeset
5881 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
5882 #endif
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5883
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5884 /* "Swap out" point from the selected window's buffer
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5885 into the window itself. (Normally the pointm of the selected
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5886 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
5887 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
5888 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
5889 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
5890 {
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
5891 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
5892 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
5893 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
5894 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
5895 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
5896 }
0753fa7a67f3 (Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents: 20535
diff changeset
5897
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5898 windows_or_buffers_changed++;
10666
e1dfb47b664e (Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents: 10461
diff changeset
5899 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
5900
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5901 /* Problem: Freeing all matrices and later allocating them again
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
5902 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
5903 really like to do is to free only those matrices not reused
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5904 below. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5905 root_window = XWINDOW (FRAME_ROOT_WINDOW (f));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5906 leaf_windows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5907 = (struct window **) alloca (count_windows (root_window)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5908 * sizeof (struct window *));
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
5909 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
5910
8931
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5911 /* Temporarily avoid any problems with windows that are smaller
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5912 than they are supposed to be. */
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5913 window_min_height = 1;
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5914 window_min_width = 1;
c64388cd7346 (struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents: 8536
diff changeset
5915
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5916 /* Kludge Alert!
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5917 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
5918 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
5919
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5920 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
5921 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
5922 dead. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5923 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
5924
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5925 for (k = 0; k < saved_windows->size; k++)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5926 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5927 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
5928 w = XWINDOW (p->window);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5929 w->next = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5930
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5931 if (!NILP (p->parent))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5932 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
5933 XFASTINT (p->parent))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5934 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5935 w->parent = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5936
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5937 if (!NILP (p->prev))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5938 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5939 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
5940 XFASTINT (p->prev))->window;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5941 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
5942 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5943 else
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5944 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5945 w->prev = Qnil;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5946 if (!NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5947 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5948 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
5949 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5950 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
5951 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
5952 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5953 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5954 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5955 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
5956 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
5957 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5958 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5959 }
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5960
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5961 /* 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
5962 restore it now. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5963 if (BUFFERP (w->total_lines))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5964 w->buffer = w->total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5965 w->left_col = p->left_col;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5966 w->top_line = p->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5967 w->total_cols = p->total_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5968 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
5969 w->hscroll = p->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
5970 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
5971 w->display_table = p->display_table;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5972 w->orig_top_line = p->orig_top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5973 w->orig_total_lines = p->orig_total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5974 w->left_margin_cols = p->left_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5975 w->right_margin_cols = p->right_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5976 w->left_fringe_width = p->left_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5977 w->right_fringe_width = p->right_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5978 w->fringes_outside_margins = p->fringes_outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5979 w->scroll_bar_width = p->scroll_bar_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
5980 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
5981 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
5982 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
5983
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5984 /* 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
5985 if (NILP (p->buffer))
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5986 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5987 else
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5988 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5989 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
5990 /* 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
5991 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5992 w->buffer = p->buffer;
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5993 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
5994 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
5995 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
5996 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
5997 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
5998
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
5999 /* 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
6000 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
6001 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
6002 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
6003 && 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
6004 Fgoto_char (w->pointm);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6005 }
3535
581c09f72dbd (Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents: 3354
diff changeset
6006 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
6007 /* 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
6008 {
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6009 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
6010 /* 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
6011 range. */
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6012 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
6013 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
6014 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6015 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6016 else
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6017 /* 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
6018 are real. */
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6019 {
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6020 /* 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
6021 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
6022 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
6023 w->buffer);
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6024 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
6025 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
6026 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
6027 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
6028 w->start_at_line_beg = Qt;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6029 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6030 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6031 }
1237
3929b2135e58 * window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents: 1123
diff changeset
6032
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6033 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
6034 /* 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
6035 using the buffer that has been restored into it.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6036 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
6037 selected_window = Qnil;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6038
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6039 /* Arrange *not* to restore point in the buffer that was
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6040 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
6041 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
6042 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
6043 make_number (old_point),
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6044 XWINDOW (data->current_window)->buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6045
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6046 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
6047 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
6048 = selected_window;
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6049
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6050 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
6051 || (FRAMEP (data->focus_frame)
1716
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6052 && FRAME_LIVE_P (XFRAME (data->focus_frame))))
95db936d47c0 * keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents: 1685
diff changeset
6053 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
6054
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6055 #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
6056 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
6057 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
6058 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
36809
126bac1a4495 (Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents: 36635
diff changeset
6059 0, 0);
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6060 #endif
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6061
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6062 /* Set the screen height to the value it had before this function. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6063 if (previous_frame_lines != FRAME_LINES (f)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6064 || previous_frame_cols != FRAME_COLS (f))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6065 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
6066 0, 0, 0);
16051
ccf489f8596e Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents: 16039
diff changeset
6067 #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
6068 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
6069 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
6070 make_number (0));
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6071 #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
6072 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
6073 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
6074 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
6075 #endif
25115
2105537c5916 (Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents: 25044
diff changeset
6076 #endif
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6077
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6078 /* 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
6079 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
6080 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6081 if (NILP (leaf_windows[i]->buffer))
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6082 {
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6083 /* Assert it's not reused as a combination. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6084 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
6085 && NILP (leaf_windows[i]->vchild));
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6086 free_window_matrices (leaf_windows[i]);
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6087 }
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6088 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
6089 ++n;
8239087d52c5 (Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents: 33255
diff changeset
6090 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6091
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6092 adjust_glyphs (f);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6093
18657
1dc4d7e374d5 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 18493
diff changeset
6094 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
6095
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6096 /* 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
6097 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
6098 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
6099 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
6100 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
6101 if (FRAME_LIVE_P (XFRAME (data->selected_frame)))
36809
126bac1a4495 (Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents: 36635
diff changeset
6102 do_switch_frame (data->selected_frame, 0, 0);
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6103
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6104 if (! NILP (Vwindow_configuration_change_hook)
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6105 && ! NILP (Vrun_hooks))
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6106 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6107 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6108
1325
f03e559aac3e * window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents: 1280
diff changeset
6109 if (!NILP (new_current_buffer))
45584
5fd12f9027a3 (Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents: 45562
diff changeset
6110 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
6111
21198
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6112 /* Restore the minimum heights recorded in the configuration. */
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6113 window_min_height = XINT (data->min_height);
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6114 window_min_width = XINT (data->min_width);
10518dc95b25 (Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents: 21022
diff changeset
6115
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6116 Vminibuf_scroll_window = data->minibuf_scroll_window;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
6117 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
6118
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6119 return (FRAME_LIVE_P (f) ? Qt : Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6120 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6121
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6122 /* Mark all windows now on frame as deleted
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6123 by setting their buffers to nil. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6124
1685
8d7fc70d3103 * window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents: 1572
diff changeset
6125 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6126 delete_all_subwindows (w)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6127 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6128 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6129 if (!NILP (w->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6130 delete_all_subwindows (XWINDOW (w->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6131 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6132 delete_all_subwindows (XWINDOW (w->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6133 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6134 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
6135
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6136 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
6137
16068
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6138 if (!NILP (w->buffer))
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6139 unshow_buffer (w);
b19129a8c644 (unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
6140
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6141 /* 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
6142 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
6143 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
6144 vchild or hchild set. */
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6145 w->buffer = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6146 w->vchild = Qnil;
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6147 w->hchild = Qnil;
30045
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6148
ff2db81c11c1 (delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 30039
diff changeset
6149 Vwindow_list = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6150 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6151
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6152 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6153 count_windows (window)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6154 register struct window *window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6155 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6156 register int count = 1;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6157 if (!NILP (window->next))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6158 count += count_windows (XWINDOW (window->next));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6159 if (!NILP (window->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6160 count += count_windows (XWINDOW (window->vchild));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6161 if (!NILP (window->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6162 count += count_windows (XWINDOW (window->hchild));
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6163 return count;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6164 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6165
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6166
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6167 /* 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
6168 Value is last index + 1. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6169
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6170 static int
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6171 get_leaf_windows (w, flat, i)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6172 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6173 struct window **flat;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6174 int i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6175 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6176 while (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6177 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6178 if (!NILP (w->hchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6179 i = get_leaf_windows (XWINDOW (w->hchild), flat, i);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6180 else if (!NILP (w->vchild))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6181 i = get_leaf_windows (XWINDOW (w->vchild), flat, i);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6182 else
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6183 flat[i++] = w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6184
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6185 w = NILP (w->next) ? 0 : XWINDOW (w->next);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6186 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6187
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6188 return i;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6189 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6190
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6191
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6192 /* 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
6193 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
6194 can be returned. */
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6195
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6196 struct glyph *
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6197 get_phys_cursor_glyph (w)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6198 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6199 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6200 struct glyph_row *row;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6201 struct glyph *glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6202
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6203 if (w->phys_cursor.vpos >= 0
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6204 && w->phys_cursor.vpos < w->current_matrix->nrows
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6205 && (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
6206 row->enabled_p)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6207 && row->used[TEXT_AREA] > w->phys_cursor.hpos)
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6208 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6209 else
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6210 glyph = NULL;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6211
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6212 return glyph;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6213 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6214
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6215
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6216 static int
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6217 save_window_save (window, vector, i)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6218 Lisp_Object window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6219 struct Lisp_Vector *vector;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6220 int i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6221 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6222 register struct saved_window *p;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6223 register struct window *w;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6224 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6225
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6226 for (;!NILP (window); window = w->next)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6227 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6228 p = SAVED_WINDOW_N (vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6229 w = XWINDOW (window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6230
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6231 XSETFASTINT (w->temslot, i); i++;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6232 p->window = window;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6233 p->buffer = w->buffer;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6234 p->left_col = w->left_col;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6235 p->top_line = w->top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6236 p->total_cols = w->total_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6237 p->total_lines = w->total_lines;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6238 p->hscroll = w->hscroll;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6239 p->min_hscroll = w->min_hscroll;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6240 p->display_table = w->display_table;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6241 p->orig_top_line = w->orig_top_line;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6242 p->orig_total_lines = w->orig_total_lines;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6243 p->left_margin_cols = w->left_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6244 p->right_margin_cols = w->right_margin_cols;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6245 p->left_fringe_width = w->left_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6246 p->right_fringe_width = w->right_fringe_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6247 p->fringes_outside_margins = w->fringes_outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6248 p->scroll_bar_width = w->scroll_bar_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6249 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6250 if (!NILP (w->buffer))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6251 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6252 /* Save w's value of point in the window configuration.
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6253 If w is the selected window, then get the value of point
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6254 from the buffer; pointm is garbage in the selected window. */
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6255 if (EQ (window, selected_window))
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6256 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6257 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
6258 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
6259 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
6260 BUF_PT_BYTE (XBUFFER (w->buffer)));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6261 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6262 else
12981
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6263 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
6264
7a540e9cb21a (save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents: 12643
diff changeset
6265 p->start = Fcopy_marker (w->start, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6266 p->start_at_line_beg = w->start_at_line_beg;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6267
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6268 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
6269 p->mark = Fcopy_marker (tem, Qnil);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6270 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6271 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6272 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6273 p->pointm = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6274 p->start = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6275 p->mark = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6276 p->start_at_line_beg = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6277 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6278
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6279 if (NILP (w->parent))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6280 p->parent = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6281 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6282 p->parent = XWINDOW (w->parent)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6283
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6284 if (NILP (w->prev))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6285 p->prev = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6286 else
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6287 p->prev = XWINDOW (w->prev)->temslot;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6288
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6289 if (!NILP (w->vchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6290 i = save_window_save (w->vchild, vector, i);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 432
diff changeset
6291 if (!NILP (w->hchild))
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6292 i = save_window_save (w->hchild, vector, i);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6293 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6294
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6295 return i;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6296 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6297
16485
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16392
diff changeset
6298 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
6299 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
6300 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
6301 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
6302 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
6303 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
6304 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
6305 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
6306 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
6307 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
6308 (frame)
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6309 Lisp_Object frame;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6310 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6311 register Lisp_Object tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6312 register int n_windows;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6313 register struct save_window_data *data;
9974
5cda62e4222a (Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9970
diff changeset
6314 register struct Lisp_Vector *vec;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6315 register int i;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6316 FRAME_PTR f;
265
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 if (NILP (frame))
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6319 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6320 CHECK_LIVE_FRAME (frame);
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6321 f = XFRAME (frame);
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6322
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6323 n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f)));
36432
28af746067b2 (make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents: 36231
diff changeset
6324 vec = allocate_other_vector (VECSIZE (struct save_window_data));
9974
5cda62e4222a (Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9970
diff changeset
6325 data = (struct save_window_data *)vec;
5cda62e4222a (Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents: 9970
diff changeset
6326
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6327 XSETFASTINT (data->frame_cols, FRAME_COLS (f));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6328 XSETFASTINT (data->frame_lines, FRAME_LINES (f));
9324
ac6a5691607f (make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents: 9282
diff changeset
6329 XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f));
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25540
diff changeset
6330 XSETFASTINT (data->frame_tool_bar_lines, FRAME_TOOL_BAR_LINES (f));
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6331 data->selected_frame = selected_frame;
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
6332 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
6333 XSETBUFFER (data->current_buffer, current_buffer);
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6334 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
6335 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
6336 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
6337 data->focus_frame = FRAME_FOCUS_FRAME (f);
9282
f4fa46f6a032 (Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents: 9243
diff changeset
6338 XSETINT (data->min_height, window_min_height);
f4fa46f6a032 (Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents: 9243
diff changeset
6339 XSETINT (data->min_width, window_min_width);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6340 tem = Fmake_vector (make_number (n_windows), Qnil);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6341 data->saved_windows = tem;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6342 for (i = 0; i < n_windows; i++)
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6343 XVECTOR (tem)->contents[i]
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6344 = 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
6345 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
6346 XSETWINDOW_CONFIGURATION (tem, data);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6347 return (tem);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6348 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6349
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6350 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
6351 0, UNEVALLED, 0,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6352 doc: /* Execute BODY, preserving window sizes and contents.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6353 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
6354 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
6355 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
6356 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
6357 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
6358 Does not restore the value of point in current buffer.
b4ffca20829f (Fsave_window_excursion): Add usage: string to doc string.
Miles Bader <miles@gnu.org>
parents: 40103
diff changeset
6359 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
6360 (args)
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6361 Lisp_Object args;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6362 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6363 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
6364 register int count = SPECPDL_INDEX ();
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6365
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6366 record_unwind_protect (Fset_window_configuration,
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 338
diff changeset
6367 Fcurrent_window_configuration (Qnil));
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6368 val = Fprogn (args);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6369 return unbind_to (count, val);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6370 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6371
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6372
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6373
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6374 /***********************************************************************
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6375 Window Split Tree
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6376 ***********************************************************************/
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6377
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6378 static Lisp_Object
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6379 window_tree (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6380 struct window *w;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6381 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6382 Lisp_Object tail = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6383 Lisp_Object result = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6384
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6385 while (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6386 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6387 Lisp_Object wn;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6388
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6389 XSETWINDOW (wn, w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6390 if (!NILP (w->hchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6391 wn = Fcons (Qnil, Fcons (Fwindow_edges (wn),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6392 window_tree (XWINDOW (w->hchild))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6393 else if (!NILP (w->vchild))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6394 wn = Fcons (Qt, Fcons (Fwindow_edges (wn),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6395 window_tree (XWINDOW (w->vchild))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6396
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6397 if (NILP (result))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6398 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6399 result = tail = Fcons (wn, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6400 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6401 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6402 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6403 XSETCDR (tail, Fcons (wn, Qnil));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6404 tail = XCDR (tail);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6405 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6406
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6407 w = NILP (w->next) ? 0 : XWINDOW (w->next);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6408 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6409
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6410 return result;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6411 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6412
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6413
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6414
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6415 DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6416 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6417 doc: /* Return the window tree for frame FRAME.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6418
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6419 The return value is a list of the form (ROOT MINI), where ROOT
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6420 represents the window tree of the frame's root window, and MINI
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6421 is the frame's minibuffer window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6422
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6423 If the root window is not split, ROOT is the root window itself.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6424 Otherwise, ROOT is a list (DIR EDGES W1 W2 ...) where DIR is nil for a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6425 horizontal split, and t for a vertical split, EDGES gives the combined
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6426 size and position of the subwindows in the split, and the rest of the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6427 elements are the subwindows in the split. Each of the subwindows may
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6428 again be a window or a list representing a window split, and so on.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6429 EDGES is a list \(LEFT TOP RIGHT BOTTOM) as returned by `window-edges'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6430
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6431 If FRAME is nil or omitted, return information on the currently
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6432 selected frame. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6433 (frame)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6434 Lisp_Object frame;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6435 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6436 FRAME_PTR f;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6437
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6438 if (NILP (frame))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6439 frame = selected_frame;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6440
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6441 CHECK_FRAME (frame);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6442 f = XFRAME (frame);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6443
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6444 if (!FRAME_LIVE_P (f))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6445 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6446
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6447 return window_tree (XWINDOW (FRAME_ROOT_WINDOW (f)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6448 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6449
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6450
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6451 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6452 Marginal Areas
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6453 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6454
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6455 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
6456 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
6457 doc: /* Set width of marginal areas of window WINDOW.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6458 If WINDOW is nil, set margins of the currently selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6459 Second arg LEFT-WIDTH specifies the number of character cells to
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6460 reserve for the left marginal area. Optional third arg RIGHT-WIDTH
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6461 does the same for the right marginal area. A nil width parameter
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6462 means no margin. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6463 (window, left_width, right_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6464 Lisp_Object window, left_width, right_width;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6465 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6466 struct window *w = decode_window (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6467
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6468 /* Translate negative or zero widths to nil.
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6469 Margins that are too wide have to be checked elsewhere. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6470
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6471 if (!NILP (left_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6472 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6473 CHECK_NUMBER (left_width);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6474 if (XINT (left_width) <= 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6475 left_width = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6476 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6477
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6478 if (!NILP (right_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6479 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6480 CHECK_NUMBER (right_width);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6481 if (XINT (right_width) <= 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6482 right_width = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6483 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6484
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6485 if (!EQ (w->left_margin_cols, left_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6486 || !EQ (w->right_margin_cols, right_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6487 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6488 w->left_margin_cols = left_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6489 w->right_margin_cols = right_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6490
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6491 adjust_window_margins (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6492
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6493 ++windows_or_buffers_changed;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6494 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6495 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6496
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6497 return Qnil;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6498 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6499
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6500
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6501 DEFUN ("window-margins", Fwindow_margins, Swindow_margins,
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6502 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
6503 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
6504 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
6505 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
6506 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
6507 as nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
6508 (window)
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6509 Lisp_Object window;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6510 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6511 struct window *w = decode_window (window);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6512 return Fcons (w->left_margin_cols, w->right_margin_cols);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6513 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6514
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6515
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6516
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6517 /***********************************************************************
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6518 Fringes
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6519 ***********************************************************************/
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6520
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6521 DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6522 2, 4, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6523 doc: /* Set the fringe widths of window WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6524 If WINDOW is nil, set the fringe widths of the currently selected
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6525 window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6526 Second arg LEFT-WIDTH specifies the number of pixels to reserve for
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6527 the left fringe. Optional third arg RIGHT-WIDTH specifies the right
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6528 fringe width. If a fringe width arg is nil, that means to use the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6529 frame's default fringe width. Default fringe widths can be set with
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6530 the command `set-fringe-style'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6531 If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6532 outside of the display margins. By default, fringes are drawn between
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6533 display marginal areas and the text area. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6534 (window, left_width, right_width, outside_margins)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6535 Lisp_Object window, left_width, right_width, outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6536 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6537 struct window *w = decode_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6538
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6539 if (!NILP (left_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6540 CHECK_NATNUM (left_width);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6541 if (!NILP (right_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6542 CHECK_NATNUM (right_width);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6543
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6544 if (!EQ (w->left_fringe_width, left_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6545 || !EQ (w->right_fringe_width, right_width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6546 || !EQ (w->fringes_outside_margins, outside_margins))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6547 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6548 w->left_fringe_width = left_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6549 w->right_fringe_width = right_width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6550 w->fringes_outside_margins = outside_margins;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6551
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6552 adjust_window_margins (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6553
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6554 clear_glyph_matrix (w->current_matrix);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6555 w->window_end_valid = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6556
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6557 ++windows_or_buffers_changed;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6558 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6559 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6560
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6561 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6562 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6563
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6564
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6565 DEFUN ("window-fringes", Fwindow_fringes, Swindow_fringes,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6566 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6567 doc: /* Get width of fringes of window WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6568 If WINDOW is omitted or nil, use the currently selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6569 Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6570 (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6571 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6572 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6573 struct window *w = decode_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6574 return Fcons (make_number (WINDOW_LEFT_FRINGE_WIDTH (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6575 Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6576 Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) ?
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6577 Qt : Qnil), Qnil)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6578 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6579
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6580
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6581
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6582 /***********************************************************************
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6583 Scroll bars
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6584 ***********************************************************************/
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6585
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6586 DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars, Sset_window_scroll_bars,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6587 2, 4, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6588 doc: /* Set width and type of scroll bars of window WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6589 If window is nil, set scroll bars of the currently selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6590 Second parameter WIDTH specifies the pixel width for the scroll bar;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6591 this is automatically adjusted to a multiple of the frame column width.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6592 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6593 bar: left, right, or nil.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6594 If WIDTH is nil, use the frame's scroll-bar width.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6595 If TYPE is t, use the frame's scroll-bar type. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6596 (window, width, vertical_type, horizontal_type)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6597 Lisp_Object window, width, vertical_type, horizontal_type;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6598 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6599 struct window *w = decode_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6600
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6601 if (!NILP (width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6602 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6603 CHECK_NATNUM (width);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6604
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6605 if (XINT (width) == 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6606 vertical_type = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6607 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6608
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6609 if (!(EQ (vertical_type, Qnil)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6610 || EQ (vertical_type, Qleft)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6611 || EQ (vertical_type, Qright)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6612 || EQ (vertical_type, Qt)))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6613 error ("Invalid type of vertical scroll bar");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6614
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6615 if (!EQ (w->scroll_bar_width, width)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6616 || !EQ (w->vertical_scroll_bar_type, vertical_type))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6617 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6618 w->scroll_bar_width = width;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6619 w->vertical_scroll_bar_type = vertical_type;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6620
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6621 adjust_window_margins (w);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6622
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6623 clear_glyph_matrix (w->current_matrix);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6624 w->window_end_valid = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6625
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6626 ++windows_or_buffers_changed;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6627 adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6628 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6629
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6630 return Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6631 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6632
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6633
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6634 DEFUN ("window-scroll-bars", Fwindow_scroll_bars, Swindow_scroll_bars,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6635 0, 1, 0,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6636 doc: /* Get width and type of scroll bars of window WINDOW.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6637 If WINDOW is omitted or nil, use the currently selected window.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6638 Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE).
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6639 If WIDTH is nil or TYPE is t, the window is using the frame's corresponding
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6640 value. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6641 (window)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6642 Lisp_Object window;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6643 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6644 struct window *w = decode_window (window);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6645 return Fcons (make_number ((WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6646 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6647 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6648 Fcons (make_number (WINDOW_SCROLL_BAR_COLS (w)),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6649 Fcons (w->vertical_scroll_bar_type,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6650 Fcons (Qnil, Qnil))));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6651 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6652
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6653
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6654
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6655 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6656 Smooth scrolling
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6657 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6658
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6659 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
6660 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
6661 Use the selected window if WINDOW is nil or omitted.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6662 Normally, value is a multiple of the canonical character height of WINDOW;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6663 optional second arg PIXELS_P means value is measured in pixels. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6664 (window, pixels_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6665 Lisp_Object window, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6666 {
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6667 Lisp_Object result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6668 struct frame *f;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6669 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6670
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6671 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6672 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6673 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6674 CHECK_WINDOW (window);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6675 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6676 f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6677
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6678 if (FRAME_WINDOW_P (f))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6679 result = (NILP (pixels_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6680 ? FRAME_CANON_Y_FROM_PIXEL_Y (f, -w->vscroll)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6681 : make_number (-w->vscroll));
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6682 else
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6683 result = make_number (0);
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6684 return result;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6685 }
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6686
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6687
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6688 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6689 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
6690 doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6691 WINDOW nil means use the selected window. Normally, VSCROLL is a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6692 non-negative multiple of the canonical character height of WINDOW;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6693 optional third arg PIXELS_P non-nil means that VSCROLL is in pixels.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6694 If PIXELS-P is nil, VSCROLL may have to be rounded so that it
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6695 corresponds to an integral number of pixels. The return value is the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6696 result of this rounding.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6697 If PIXELS-P is non-nil, the return value is VSCROLL. */)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6698 (window, vscroll, pixels_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6699 Lisp_Object window, vscroll, pixels_p;
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6700 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6701 struct window *w;
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6702 struct frame *f;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6703
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6704 if (NILP (window))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6705 window = selected_window;
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6706 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6707 CHECK_WINDOW (window);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40619
diff changeset
6708 CHECK_NUMBER_OR_FLOAT (vscroll);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6709
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6710 w = XWINDOW (window);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6711 f = XFRAME (w->frame);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6712
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6713 if (FRAME_WINDOW_P (f))
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6714 {
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6715 int old_dy = w->vscroll;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6716
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6717 w->vscroll = - (NILP (pixels_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6718 ? FRAME_LINE_HEIGHT (f) * XFLOATINT (vscroll)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6719 : XFLOATINT (vscroll));
25549
63deb587dce1 (Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6720 w->vscroll = min (w->vscroll, 0);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6721
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6722 if (w->vscroll != old_dy)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6723 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6724 /* Adjust glyph matrix of the frame if the virtual display
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6725 area becomes larger than before. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6726 if (w->vscroll < 0 && w->vscroll < old_dy)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6727 adjust_glyphs (f);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6728
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6729 /* Prevent redisplay shortcuts. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6730 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6731 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6732 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6733
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6734 return Fwindow_vscroll (window, pixels_p);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6735 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6736
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6737
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6738 /* 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
6739 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
6740 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
6741
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6742 void
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6743 foreach_window (f, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6744 struct frame *f;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6745 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6746 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6747 {
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6748 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
6749 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6750
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6751
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6752 /* 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
6753 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
6754 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
6755 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
6756
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6757 static int
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6758 foreach_window_1 (w, fn, user_data)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6759 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6760 int (* fn) P_ ((struct window *, void *));
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6761 void *user_data;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6762 {
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6763 int cont;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6764
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6765 for (cont = 1; w && cont;)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6766 {
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6767 if (!NILP (w->hchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6768 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
6769 else if (!NILP (w->vchild))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6770 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6771 else
30366
8dd313fc287d (foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents: 30362
diff changeset
6772 cont = fn (w, user_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6773
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6774 w = NILP (w->next) ? 0 : XWINDOW (w->next);
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6775 }
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6776
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6777 return cont;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6778 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6779
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6780
39952
17e0900cd156 Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39748
diff changeset
6781 /* 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
6782 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
6783 the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6784
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6785 static int
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6786 freeze_window_start (w, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6787 struct window *w;
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6788 void *freeze_p;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6789 {
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6790 if (w == XWINDOW (selected_window)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6791 || MINI_WINDOW_P (w)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6792 || (MINI_WINDOW_P (XWINDOW (selected_window))
28726
5f7ccec488b5 (freeze_window_start): Check that minibuffer scroll window isn't nil before
Ken Raeburn <raeburn@raeburn.org>
parents: 28505
diff changeset
6793 && ! NILP (Vminibuf_scroll_window)
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6794 && w == XWINDOW (Vminibuf_scroll_window)))
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6795 freeze_p = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6796
30362
fc017b1b2a7d (foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents: 30265
diff changeset
6797 w->frozen_window_start_p = freeze_p != NULL;
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6798 return 1;
25517
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6799 }
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6800
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6801
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6802 /* 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
6803 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
6804 means freeze the window start. */
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6805
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6806 void
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6807 freeze_window_starts (f, freeze_p)
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6808 struct frame *f;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6809 int freeze_p;
619897099dc4 (foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25462
diff changeset
6810 {
31903
3e0a1f91c149 (freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents: 31829
diff changeset
6811 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
6812 }
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6813
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6814
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6815 /***********************************************************************
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6816 Initialization
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6817 ***********************************************************************/
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
6818
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6819 /* Return 1 if window configurations C1 and C2
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6820 describe the same state of affairs. This is used by Fequal. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6821
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6822 int
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6823 compare_window_configurations (c1, c2, ignore_positions)
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6824 Lisp_Object c1, c2;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6825 int ignore_positions;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6826 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6827 register struct save_window_data *d1, *d2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6828 struct Lisp_Vector *sw1, *sw2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6829 int i;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6830
28505
b5a7eb24964c (compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents: 28463
diff changeset
6831 if (!WINDOW_CONFIGURATIONP (c1))
b5a7eb24964c (compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents: 28463
diff changeset
6832 wrong_type_argument (Qwindow_configuration_p, c1);
b5a7eb24964c (compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents: 28463
diff changeset
6833 if (!WINDOW_CONFIGURATIONP (c2))
b5a7eb24964c (compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents: 28463
diff changeset
6834 wrong_type_argument (Qwindow_configuration_p, c2);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6835
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6836 d1 = (struct save_window_data *) XVECTOR (c1);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6837 d2 = (struct save_window_data *) XVECTOR (c2);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6838 sw1 = XVECTOR (d1->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6839 sw2 = XVECTOR (d2->saved_windows);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6840
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6841 if (! EQ (d1->frame_cols, d2->frame_cols))
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6842 return 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6843 if (! EQ (d1->frame_lines, d2->frame_lines))
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6844 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6845 if (! EQ (d1->frame_menu_bar_lines, d2->frame_menu_bar_lines))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6846 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6847 if (! EQ (d1->selected_frame, d2->selected_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6848 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6849 /* Don't compare the current_window field directly.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6850 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
6851 if (! EQ (d1->current_buffer, d2->current_buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6852 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6853 if (! ignore_positions)
43571
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6854 {
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6855 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
6856 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6857 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
6858 return 0;
d3b03dea29d4 (Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents: 43281
diff changeset
6859 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6860 /* Don't compare the root_window field.
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6861 We don't require the two configurations
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6862 to use the same window object,
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6863 and the two root windows must be equivalent
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6864 if everything else compares equal. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6865 if (! EQ (d1->focus_frame, d2->focus_frame))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6866 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6867 if (! EQ (d1->min_width, d2->min_width))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6868 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6869 if (! EQ (d1->min_height, d2->min_height))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6870 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6871
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6872 /* 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
6873 if (sw1->size != sw2->size)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6874 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6875
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6876 for (i = 0; i < sw1->size; i++)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6877 {
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6878 struct saved_window *p1, *p2;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6879 int w1_is_current, w2_is_current;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6880
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6881 p1 = SAVED_WINDOW_N (sw1, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6882 p2 = SAVED_WINDOW_N (sw2, i);
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6883
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6884 /* Verify that the current windows in the two
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6885 configurations correspond to each other. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6886 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
6887 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
6888
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6889 if (w1_is_current != w2_is_current)
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6890 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6891
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6892 /* Verify that the corresponding windows do match. */
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6893 if (! EQ (p1->buffer, p2->buffer))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6894 return 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6895 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
6896 return 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6897 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
6898 return 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6899 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
6900 return 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6901 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
6902 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6903 if (! EQ (p1->display_table, p2->display_table))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6904 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6905 if (! EQ (p1->parent, p2->parent))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6906 return 0;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6907 if (! EQ (p1->prev, p2->prev))
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6908 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6909 if (! ignore_positions)
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6910 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6911 if (! EQ (p1->hscroll, p2->hscroll))
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6912 return 0;
34747
b17790c2efbf (make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents: 34735
diff changeset
6913 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
6914 return 0;
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6915 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
6916 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6917 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
6918 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6919 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
6920 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6921 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
6922 return 0;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6923 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6924 if (! EQ (p1->left_margin_cols, p2->left_margin_cols))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6925 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6926 if (! EQ (p1->right_margin_cols, p2->right_margin_cols))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6927 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6928 if (! EQ (p1->left_fringe_width, p2->left_fringe_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6929 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6930 if (! EQ (p1->right_fringe_width, p2->right_fringe_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6931 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6932 if (! EQ (p1->fringes_outside_margins, p2->fringes_outside_margins))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6933 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6934 if (! EQ (p1->scroll_bar_width, p2->scroll_bar_width))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6935 return 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6936 if (! EQ (p1->vertical_scroll_bar_type, p2->vertical_scroll_bar_type))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6937 return 0;
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6938 }
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6939
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6940 return 1;
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6941 }
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6942
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6943 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
6944 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
6945 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
6946 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
6947 and scrolling positions. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
6948 (x, y)
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6949 Lisp_Object x, y;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6950 {
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6951 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
6952 return Qt;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6953 return Qnil;
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
6954 }
20777
a9e1b9bf06e3 (compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6955
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
6956 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6957 init_window_once ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6958 {
25676
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6959 struct frame *f = make_terminal_frame ();
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6960 XSETFRAME (selected_frame, f);
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6961 Vterminal_frame = selected_frame;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6962 minibuf_window = f->minibuffer_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6963 selected_window = f->selected_window;
70c6d3f2f3b9 (Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents: 25591
diff changeset
6964 last_nonminibuf_frame = f;
14445
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
6965
e73b37519cdc (Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents: 14204
diff changeset
6966 window_initialized = 1;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6967 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6968
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
6969 void
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6970 init_window ()
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6971 {
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6972 Vwindow_list = Qnil;
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6973 }
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6974
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6975 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6976 syms_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6977 {
25540
2b4bdd114899 (Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents: 25517
diff changeset
6978 Qwindow_size_fixed = intern ("window-size-fixed");
2b4bdd114899 (Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents: 25517
diff changeset
6979 staticpro (&Qwindow_size_fixed);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
6980 Fset (Qwindow_size_fixed, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49011
diff changeset
6981
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
6982 staticpro (&Qwindow_configuration_change_hook);
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
6983 Qwindow_configuration_change_hook
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
6984 = intern ("window-configuration-change-hook");
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
6985
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6986 Qwindowp = intern ("windowp");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6987 staticpro (&Qwindowp);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6988
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6989 Qwindow_configuration_p = intern ("window-configuration-p");
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6990 staticpro (&Qwindow_configuration_p);
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
6991
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
6992 Qwindow_live_p = intern ("window-live-p");
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
6993 staticpro (&Qwindow_live_p);
1444
559d2f2119aa * window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents: 1345
diff changeset
6994
11405
645e3883da72 (temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents: 11307
diff changeset
6995 Qtemp_buffer_show_hook = intern ("temp-buffer-show-hook");
10461
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
6996 staticpro (&Qtemp_buffer_show_hook);
d3dee0c530d6 (Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 10373
diff changeset
6997
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
6998 staticpro (&Vwindow_list);
43597
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
6999
8097923cfe85 (syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents: 43594
diff changeset
7000 minibuf_selected_window = Qnil;
43594
23cddac4d0b7 (minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents: 43571
diff changeset
7001 staticpro (&minibuf_selected_window);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7002
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7003 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
7004 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
7005 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
7006 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
7007 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
7008 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
7009 Vtemp_buffer_show_function = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7010
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7011 DEFVAR_LISP ("display-buffer-function", &Vdisplay_buffer_function,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7012 doc: /* If non-nil, function to call to handle `display-buffer'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7013 It will receive two args, the buffer and a flag which if non-nil means
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7014 that the currently selected window is not acceptable.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7015 It should choose or create a window, display the specified buffer in it,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7016 and return the window.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7017 Commands such as `switch-to-buffer-other-window' and `find-file-other-window'
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7018 work using this function. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7019 Vdisplay_buffer_function = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7020
34261
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
7021 DEFVAR_LISP ("even-window-heights", &Veven_window_heights,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7022 doc: /* *If non-nil, `display-buffer' should even the window heights.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7023 If nil, `display-buffer' will leave the window configuration alone. */);
34261
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
7024 Veven_window_heights = Qt;
c50a8c8171b7 (Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 34097
diff changeset
7025
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7026 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
7027 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
7028 Vminibuf_scroll_window = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7029
43281
a4ea76de57c9 (Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents: 43241
diff changeset
7030 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
7031 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
7032 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
7033 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
7034 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
7035
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7036 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
7037 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
7038 Vother_window_scroll_buffer = Qnil;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7039
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
7040 DEFVAR_BOOL ("pop-up-frames", &pop_up_frames,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7041 doc: /* *Non-nil means `display-buffer' should make a separate frame. */);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
7042 pop_up_frames = 0;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7043
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7044 DEFVAR_BOOL ("auto-window-vscroll", &auto_window_vscroll_p,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7045 doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines. */);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7046 auto_window_vscroll_p = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7047
30560
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
7048 DEFVAR_BOOL ("display-buffer-reuse-frames", &display_buffer_reuse_frames,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7049 doc: /* *Non-nil means `display-buffer' should reuse frames.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7050 If the buffer in question is already displayed in a frame, raise that frame. */);
30560
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
7051 display_buffer_reuse_frames = 0;
e4ba830b426d (display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30446
diff changeset
7052
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
7053 DEFVAR_LISP ("pop-up-frame-function", &Vpop_up_frame_function,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7054 doc: /* Function to call to handle automatic new frame creation.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7055 It is called with no arguments and should return a newly created frame.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7056
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7057 A typical value might be `(lambda () (new-frame pop-up-frame-alist))'
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7058 where `pop-up-frame-alist' would hold the default frame parameters. */);
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 735
diff changeset
7059 Vpop_up_frame_function = Qnil;
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7060
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7061 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7062 doc: /* *List of buffer names that should have their own special frames.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7063 Displaying a buffer with `display-buffer' or `pop-to-buffer',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7064 if its name is in this list, makes a special frame for it
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7065 using `special-display-function'. See also `special-display-regexps'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7066
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7067 An element of the list can be a list instead of just a string.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7068 There are two ways to use a list as an element:
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7069 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7070 In the first case, the FRAME-PARAMETERS are pairs of the form
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7071 \(PARAMETER . VALUE); these parameter values are used to create the frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7072 In the second case, FUNCTION is called with BUFFER as the first argument,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7073 followed by the OTHER-ARGS--it can display BUFFER in any way it likes.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7074 All this is done by the function found in `special-display-function'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7075
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7076 If the specified frame parameters include (same-buffer . t), the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7077 buffer is displayed in the currently selected window. Otherwise, if
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7078 they include (same-frame . t), the buffer is displayed in a new window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7079 in the currently selected frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7080
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7081 If this variable appears \"not to work\", because you add a name to it
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7082 but that buffer still appears in the selected window, look at the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7083 values of `same-window-buffer-names' and `same-window-regexps'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7084 Those variables take precedence over this one. */);
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7085 Vspecial_display_buffer_names = Qnil;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7086
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7087 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7088 doc: /* *List of regexps saying which buffers should have their own special frames.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7089 When displaying a buffer with `display-buffer' or `pop-to-buffer',
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7090 if any regexp in this list matches the buffer name, it makes a
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7091 special frame for the buffer by calling `special-display-function'.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7092
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7093 An element of the list can be a list instead of just a string.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7094 There are two ways to use a list as an element:
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7095 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7096 In the first case, the FRAME-PARAMETERS are pairs of the form
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7097 \(PARAMETER . VALUE); these parameter values are used to create the frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7098 In the second case, FUNCTION is called with BUFFER as the first argument,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7099 followed by the OTHER-ARGS--it can display the buffer in any way it likes.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7100 All this is done by the function found in `special-display-function'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7101
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7102 If the specified frame parameters include (same-buffer . t), the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7103 buffer is displayed in the currently selected window. Otherwise, if
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7104 they include (same-frame . t), the buffer is displayed in a new window
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7105 in the currently selected frame.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7106
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7107 If this variable appears \"not to work\", because you add a regexp to it
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7108 but the matching buffers still appear in the selected window, look at the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7109 values of `same-window-buffer-names' and `same-window-regexps'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7110 Those variables take precedence over this one. */);
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7111 Vspecial_display_regexps = Qnil;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7112
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7113 DEFVAR_LISP ("special-display-function", &Vspecial_display_function,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7114 doc: /* Function to call to make a new frame for a special buffer.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7115 It is called with two arguments, the buffer and optional buffer specific
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7116 data, and should return a window displaying that buffer.
47973
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7117 The default value normally makes a separate frame for the buffer,
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7118 using `special-display-frame-alist' to specify the frame parameters.
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7119 But if the buffer specific data includes (same-buffer . t) then the
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7120 buffer is displayed in the current selected window.
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7121 Otherwise if it includes (same-frame . t) then the buffer is displayed in
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7122 a new window in the currently selected frame.
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7123
b75515b80900 (window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47865
diff changeset
7124 A buffer is special if it is listed in `special-display-buffer-names'
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7125 or matches a regexp in `special-display-regexps'. */);
7056
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7126 Vspecial_display_function = Qnil;
0a18af7eb587 Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents: 6982
diff changeset
7127
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7128 DEFVAR_LISP ("same-window-buffer-names", &Vsame_window_buffer_names,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7129 doc: /* *List of buffer names that should appear in the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7130 Displaying one of these buffers using `display-buffer' or `pop-to-buffer'
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7131 switches to it in the selected window, rather than making it appear
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7132 in some other window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7133
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7134 An element of the list can be a cons cell instead of just a string.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7135 Then the car must be a string, which specifies the buffer name.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7136 This is for compatibility with `special-display-buffer-names';
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7137 the cdr of the cons cell is ignored.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7138
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7139 See also `same-window-regexps'. */);
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7140 Vsame_window_buffer_names = Qnil;
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7141
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7142 DEFVAR_LISP ("same-window-regexps", &Vsame_window_regexps,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7143 doc: /* *List of regexps saying which buffers should appear in the selected window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7144 If a buffer name matches one of these regexps, then displaying it
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7145 using `display-buffer' or `pop-to-buffer' switches to it
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7146 in the selected window, rather than making it appear in some other window.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7147
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7148 An element of the list can be a cons cell instead of just a string.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7149 Then the car must be a string, which specifies the buffer name.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7150 This is for compatibility with `special-display-buffer-names';
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7151 the cdr of the cons cell is ignored.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7152
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7153 See also `same-window-buffer-names'. */);
10958
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7154 Vsame_window_regexps = Qnil;
c0d821d95739 (Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10808
diff changeset
7155
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7156 DEFVAR_BOOL ("pop-up-windows", &pop_up_windows,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7157 doc: /* *Non-nil means display-buffer should make new windows. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7158 pop_up_windows = 1;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7159
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7160 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
7161 doc: /* *Number of lines of continuity when scrolling by screenfuls. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7162 next_screen_context_lines = 2;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7163
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7164 DEFVAR_INT ("split-height-threshold", &split_height_threshold,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7165 doc: /* *A window must be at least this tall to be eligible for splitting by `display-buffer'.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7166 If there is only one window, it is split regardless of this value. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7167 split_height_threshold = 500;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7168
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7169 DEFVAR_INT ("window-min-height", &window_min_height,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7170 doc: /* *Delete any window less than this tall (including its mode line). */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7171 window_min_height = 4;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7172
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7173 DEFVAR_INT ("window-min-width", &window_min_width,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7174 doc: /* *Delete any window less than this wide. */);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7175 window_min_width = 10;
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7176
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7177 DEFVAR_LISP ("scroll-preserve-screen-position",
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7178 &Vscroll_preserve_screen_position,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7179 doc: /* *Controls if scroll commands move point to keep its screen line unchanged.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7180 A value of nil means point does not keep its screen position except
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7181 at the scroll margin or window boundary respectively.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7182 A value of t means point keeps its screen position if the scroll
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7183 command moved it vertically out of the window, e.g. when scrolling
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7184 by full screens.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7185 Any other value means point always keeps its screen position. */);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7186 Vscroll_preserve_screen_position = Qnil;
16980
3da3a2934be5 (scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16751
diff changeset
7187
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7188 DEFVAR_LISP ("window-configuration-change-hook",
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7189 &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
7190 doc: /* Functions to call when window configuration changes.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39958
diff changeset
7191 The selected frame is the one whose configuration has changed. */);
17281
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7192 Vwindow_configuration_change_hook = Qnil;
4f3c71b28278 (Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17226
diff changeset
7193
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7194 defsubr (&Sselected_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7195 defsubr (&Sminibuffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7196 defsubr (&Swindow_minibuffer_p);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7197 defsubr (&Swindowp);
2210
22d78dbb3cc7 Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents: 2190
diff changeset
7198 defsubr (&Swindow_live_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7199 defsubr (&Spos_visible_in_window_p);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7200 defsubr (&Swindow_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7201 defsubr (&Swindow_height);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7202 defsubr (&Swindow_width);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7203 defsubr (&Swindow_hscroll);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7204 defsubr (&Sset_window_hscroll);
13457
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7205 defsubr (&Swindow_redisplay_end_trigger);
8a1986b2cc76 (Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13418
diff changeset
7206 defsubr (&Sset_window_redisplay_end_trigger);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7207 defsubr (&Swindow_edges);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7208 defsubr (&Swindow_pixel_edges);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7209 defsubr (&Swindow_inside_edges);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7210 defsubr (&Swindow_inside_pixel_edges);
432
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7211 defsubr (&Scoordinates_in_window_p);
4d44159f7481 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 362
diff changeset
7212 defsubr (&Swindow_at);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7213 defsubr (&Swindow_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7214 defsubr (&Swindow_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7215 defsubr (&Swindow_end);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7216 defsubr (&Sset_window_point);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7217 defsubr (&Sset_window_start);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7218 defsubr (&Swindow_dedicated_p);
722
0a2391511b46 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 708
diff changeset
7219 defsubr (&Sset_window_dedicated_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7220 defsubr (&Swindow_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7221 defsubr (&Sset_window_display_table);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7222 defsubr (&Snext_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7223 defsubr (&Sprevious_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7224 defsubr (&Sother_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7225 defsubr (&Sget_lru_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7226 defsubr (&Sget_largest_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7227 defsubr (&Sget_buffer_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7228 defsubr (&Sdelete_other_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7229 defsubr (&Sdelete_windows_on);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7230 defsubr (&Sreplace_buffer_in_windows);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7231 defsubr (&Sdelete_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7232 defsubr (&Sset_window_buffer);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7233 defsubr (&Sselect_window);
16390
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
7234 defsubr (&Sspecial_display_p);
77051008303f (Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents: 16338
diff changeset
7235 defsubr (&Ssame_window_p);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7236 defsubr (&Sdisplay_buffer);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7237 defsubr (&Sforce_window_update);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7238 defsubr (&Ssplit_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7239 defsubr (&Senlarge_window);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7240 defsubr (&Sshrink_window);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7241 defsubr (&Sadjust_window_trailing_edge);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7242 defsubr (&Sscroll_up);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7243 defsubr (&Sscroll_down);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7244 defsubr (&Sscroll_left);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7245 defsubr (&Sscroll_right);
8053
60792df5f81f (Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7663
diff changeset
7246 defsubr (&Sother_window_for_scrolling);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7247 defsubr (&Sscroll_other_window);
43624
a38ac87b3085 (Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents: 43620
diff changeset
7248 defsubr (&Sminibuffer_selected_window);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7249 defsubr (&Srecenter);
34416
0d16962724cb (displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents: 34409
diff changeset
7250 defsubr (&Swindow_text_height);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7251 defsubr (&Smove_to_window_line);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7252 defsubr (&Swindow_configuration_p);
23410
02cc44ea2455 (window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 22923
diff changeset
7253 defsubr (&Swindow_configuration_frame);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7254 defsubr (&Sset_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7255 defsubr (&Scurrent_window_configuration);
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7256 defsubr (&Ssave_window_excursion);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7257 defsubr (&Swindow_tree);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7258 defsubr (&Sset_window_margins);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7259 defsubr (&Swindow_margins);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7260 defsubr (&Sset_window_fringes);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7261 defsubr (&Swindow_fringes);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7262 defsubr (&Sset_window_scroll_bars);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7263 defsubr (&Swindow_scroll_bars);
24997
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7264 defsubr (&Swindow_vscroll);
5e507b813c1d (Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents: 24230
diff changeset
7265 defsubr (&Sset_window_vscroll);
21022
52bc6b672a50 (compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents: 20867
diff changeset
7266 defsubr (&Scompare_window_configurations);
30037
79b4fa5288c3 (Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 29488
diff changeset
7267 defsubr (&Swindow_list);
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7268 }
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7269
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21227
diff changeset
7270 void
265
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7271 keys_of_window ()
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7272 {
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7273 initial_define_key (control_x_map, '1', "delete-other-windows");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7274 initial_define_key (control_x_map, '2', "split-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7275 initial_define_key (control_x_map, '0', "delete-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7276 initial_define_key (control_x_map, 'o', "other-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7277 initial_define_key (control_x_map, '^', "enlarge-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7278 initial_define_key (control_x_map, '<', "scroll-left");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7279 initial_define_key (control_x_map, '>', "scroll-right");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7280
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7281 initial_define_key (global_map, Ctl ('V'), "scroll-up");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7282 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7283 initial_define_key (meta_map, 'v', "scroll-down");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7284
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7285 initial_define_key (global_map, Ctl('L'), "recenter");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7286 initial_define_key (meta_map, 'r', "move-to-window-line");
8df170a4c9d1 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7287 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7288
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7289 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49600
diff changeset
7290 (do not change this comment) */