Mercurial > emacs
annotate src/window.c @ 50359:bf4734e2fa2c
(Qauto_raise, Qauto_lower, ...): Remove vars for frame
parameters now defined in frame.h and frame.c.
(Vx_resource_name): Remove. Use generic var.
(check_x_display_info): Make non-static (for frame.c).
(struct x_frame_parm_table, x_frame_parms): Remove.
(init_x_parm_symbols, x_set_frame_parameters, x_report_frame_params)
(x_set_line_spacing, x_set_screen_gamma, x_icon_type, x_set_font)
(x_set_border_width, x_set_internal_border_width, x_set_visibility)
(x_change_window_heights, x_set_autoraise, x_set_autolower)
(x_set_vertical_scroll_bars, x_set_scroll_bar_width)
(validate_x_resource_name, Fx_get_resource, x_get_resource_string)
(x_default_parameter, Fx_parse_geometry, x_figure_window_size):
Remove. Use generic functions instead.
(enum resource_types): Remove.
(x_set_scroll_bar_default_width): New global function (for frame.c).
(mac_frame_parm_handlers): New table for redisplay_interface.
(syms_of_macfns): Don't intern/staticpro removed vars.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 31 Mar 2003 20:34:30 +0000 |
| parents | e25cbad07868 |
| children | 169f9122da43 |
| rev | line source |
|---|---|
| 265 | 1 /* Window creation, deletion and examination for GNU Emacs. |
| 2 Does not include redisplay. | |
|
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
3 Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001, 2002, 2003 |
|
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
4 Free Software Foundation, Inc. |
| 265 | 5 |
| 6 This file is part of GNU Emacs. | |
| 7 | |
| 8 GNU Emacs is free software; you can redistribute it and/or modify | |
| 9 it under the terms of the GNU General Public License as published by | |
| 708 | 10 the Free Software Foundation; either version 2, or (at your option) |
| 265 | 11 any later version. |
| 12 | |
| 13 GNU Emacs is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU General Public License for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14175
diff
changeset
|
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14175
diff
changeset
|
21 Boston, MA 02111-1307, USA. */ |
| 265 | 22 |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4570
diff
changeset
|
23 #include <config.h> |
| 265 | 24 #include "lisp.h" |
| 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 | 28 #include "frame.h" |
| 265 | 29 #include "window.h" |
| 30 #include "commands.h" | |
| 31 #include "indent.h" | |
| 32 #include "termchar.h" | |
| 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 | 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 | 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; |
| 25268 | 55 extern Lisp_Object Qheight, Qwidth; |
| 265 | 56 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
57 static int displayed_window_lines P_ ((struct window *)); |
| 20351 | 58 static struct window *decode_window P_ ((Lisp_Object)); |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
59 static Lisp_Object select_window_1 P_ ((Lisp_Object, int)); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
60 static int count_windows P_ ((struct window *)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
61 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
|
62 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
|
63 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
|
64 static void window_scroll_line_based P_ ((Lisp_Object, int, int, int)); |
| 25268 | 65 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
|
66 static int window_min_size P_ ((struct window *, int, int, int *)); |
| 25268 | 67 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
|
68 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
|
69 static int window_fixed_size_p P_ ((struct window *, int, int)); |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
70 static void enlarge_window P_ ((Lisp_Object, int, int, int)); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
71 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
|
72 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
|
73 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
|
74 Lisp_Object)); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
75 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
76 Lisp_Object, int)); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
77 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
|
78 Lisp_Object *)); |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
79 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
|
80 int (* fn) (struct window *, void *), |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
81 void *)); |
|
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
82 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
|
83 |
|
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
84 /* The value of `window-size-fixed'. */ |
|
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
85 |
|
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
86 int window_size_fixed; |
|
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
87 |
| 265 | 88 /* This is the window in which the terminal's cursor should |
| 89 be left when nothing is being done with it. This must | |
| 90 always be a leaf window, and its buffer is selected by | |
| 91 the top level editing loop at the end of each command. | |
| 92 | |
| 93 This value is always the same as | |
| 769 | 94 FRAME_SELECTED_WINDOW (selected_frame). */ |
| 265 | 95 |
| 96 Lisp_Object selected_window; | |
| 97 | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
98 /* A list of all windows for use by next_window and Fwindow_list. |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
99 Functions creating or deleting windows should invalidate this cache |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
100 by setting it to nil. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
101 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
102 Lisp_Object Vwindow_list; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
103 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
104 /* The mini-buffer window of the selected frame. |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
105 Note that you cannot test for mini-bufferness of an arbitrary window |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
106 by comparing against this; but you can test for mini-bufferness of |
| 265 | 107 the selected window. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
108 |
| 265 | 109 Lisp_Object minibuf_window; |
| 110 | |
|
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
111 /* Non-nil means it is the window whose mode line should be |
|
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
112 shown as the selected window when the minibuffer is selected. */ |
|
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
113 |
|
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
114 Lisp_Object minibuf_selected_window; |
|
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
115 |
| 265 | 116 /* Non-nil means it is the window for C-M-v to scroll |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
117 when the mini-buffer is selected. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
118 |
| 265 | 119 Lisp_Object Vminibuf_scroll_window; |
| 120 | |
| 121 /* Non-nil means this is the buffer whose window C-M-v should scroll. */ | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
122 |
| 265 | 123 Lisp_Object Vother_window_scroll_buffer; |
| 124 | |
| 125 /* Non-nil means it's function to call to display temp buffers. */ | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
126 |
| 265 | 127 Lisp_Object Vtemp_buffer_show_function; |
| 128 | |
|
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
129 /* 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
|
130 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
|
131 minibuffer is active. */ |
|
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
132 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
|
133 |
| 265 | 134 /* 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
|
135 |
|
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
|
136 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
|
137 EMACS_INT window_min_width; |
| 265 | 138 |
| 139 /* Nonzero implies Fdisplay_buffer should create windows. */ | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
140 |
| 265 | 141 int pop_up_windows; |
| 142 | |
| 769 | 143 /* Nonzero implies make new frames for Fdisplay_buffer. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
144 |
| 769 | 145 int pop_up_frames; |
| 265 | 146 |
|
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
147 /* Nonzero means reuse existing frames for displaying buffers. */ |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
148 |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
149 int display_buffer_reuse_frames; |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
150 |
| 265 | 151 /* 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
|
152 |
| 769 | 153 Lisp_Object Vpop_up_frame_function; |
| 265 | 154 |
| 155 /* Function to call to handle Fdisplay_buffer. */ | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
156 |
| 265 | 157 Lisp_Object Vdisplay_buffer_function; |
| 158 | |
|
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
159 /* 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
|
160 |
|
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
161 Lisp_Object Veven_window_heights; |
|
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
162 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
163 /* 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
|
164 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
165 Lisp_Object Vspecial_display_buffer_names; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
166 |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
167 /* 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
|
168 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
169 Lisp_Object Vspecial_display_regexps; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
170 |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
171 /* Function to pop up a special frame. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
172 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
173 Lisp_Object Vspecial_display_function; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
174 |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
175 /* 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
|
176 |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
177 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
|
178 |
|
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
179 /* 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
|
180 |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
181 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
|
182 |
|
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
183 /* 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
|
184 |
|
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
185 Lisp_Object Qtemp_buffer_show_hook; |
|
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
186 |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
187 /* Fdisplay_buffer always splits the largest window |
| 265 | 188 if that window is more than this high. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
189 |
|
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
|
190 EMACS_INT split_height_threshold; |
| 265 | 191 |
| 192 /* 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
|
193 |
|
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
194 EMACS_INT next_screen_context_lines; |
| 265 | 195 |
| 196 /* Incremented for each window created. */ | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
197 |
| 265 | 198 static int sequence_number; |
| 199 | |
|
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
200 /* Nonzero after init_window_once has finished. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
201 |
|
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
202 static int window_initialized; |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
203 |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
204 /* Hook to run when window config changes. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
205 |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
206 Lisp_Object Qwindow_configuration_change_hook; |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
207 Lisp_Object Vwindow_configuration_change_hook; |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
208 |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
209 /* Nonzero means scroll commands try to put point |
|
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
210 at the same screen height as previously. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
211 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
212 Lisp_Object Vscroll_preserve_screen_position; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
213 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
214 #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
|
215 /* 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
|
216 static int inhibit_frame_unsplittable; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
217 #endif /* 0 */ |
|
17540
eb82c4de9dea
(frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17365
diff
changeset
|
218 |
|
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
|
219 extern EMACS_INT scroll_margin; |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
220 |
|
14149
0d67df27dc2a
(Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents:
14089
diff
changeset
|
221 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
| 265 | 222 |
| 223 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
|
224 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
|
225 (object) |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
226 Lisp_Object object; |
| 265 | 227 { |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
228 return WINDOWP (object) ? Qt : Qnil; |
| 265 | 229 } |
| 230 | |
|
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
231 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
|
232 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
|
233 (object) |
|
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
234 Lisp_Object object; |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
235 { |
|
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
236 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
|
237 } |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
238 |
| 265 | 239 Lisp_Object |
| 240 make_window () | |
| 241 { | |
|
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
242 Lisp_Object val; |
| 265 | 243 register struct window *p; |
|
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
244 |
|
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
245 p = allocate_window (); |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
246 XSETFASTINT (p->sequence_number, ++sequence_number); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
247 XSETFASTINT (p->left, 0); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
248 XSETFASTINT (p->top, 0); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
249 XSETFASTINT (p->height, 0); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
250 XSETFASTINT (p->width, 0); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
251 XSETFASTINT (p->hscroll, 0); |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
252 XSETFASTINT (p->min_hscroll, 0); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
253 p->orig_top = p->orig_height = Qnil; |
| 265 | 254 p->start = Fmake_marker (); |
| 255 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
|
256 XSETFASTINT (p->use_time, 0); |
| 769 | 257 p->frame = Qnil; |
| 265 | 258 p->display_table = Qnil; |
| 259 p->dedicated = Qnil; | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
260 p->pseudo_window_p = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
261 bzero (&p->cursor, sizeof (p->cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
262 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
263 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
264 p->desired_matrix = p->current_matrix = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
265 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
|
266 p->phys_cursor_width = -1; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
267 p->must_be_updated_p = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
268 XSETFASTINT (p->window_end_vpos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
269 XSETFASTINT (p->window_end_pos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
270 p->window_end_valid = Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
271 p->vscroll = 0; |
|
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
272 XSETWINDOW (val, p); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
273 XSETFASTINT (p->last_point, 0); |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
274 p->frozen_window_start_p = 0; |
|
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
275 p->height_fixed_p = 0; |
|
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
276 p->last_cursor_off_p = p->cursor_off_p = 0; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
277 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
278 Vwindow_list = Qnil; |
| 265 | 279 return val; |
| 280 } | |
| 281 | |
| 282 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
|
283 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
|
284 () |
| 265 | 285 { |
| 286 return selected_window; | |
| 287 } | |
| 288 | |
|
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
289 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
|
290 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
|
291 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
|
292 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
|
293 (frame) |
|
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
294 Lisp_Object frame; |
| 265 | 295 { |
|
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
296 if (NILP (frame)) |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
297 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
298 CHECK_LIVE_FRAME (frame); |
|
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
299 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
| 265 | 300 } |
| 301 | |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
302 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 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
|
303 doc: /* Returns non-nil if WINDOW is a minibuffer window. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
304 (window) |
| 265 | 305 Lisp_Object window; |
| 306 { | |
| 307 struct window *w = decode_window (window); | |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
308 return MINI_WINDOW_P (w) ? Qt : Qnil; |
|
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
309 } |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
310 |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
311 |
| 265 | 312 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
|
313 Spos_visible_in_window_p, 0, 3, 0, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
314 doc: /* Return t if position POS is currently on the frame in WINDOW. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
315 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
|
316 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
|
317 optional argument PARTIALLY is non-nil. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
318 POS defaults to point in WINDOW; 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
|
319 (pos, window, partially) |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
320 Lisp_Object pos, window, partially; |
| 265 | 321 { |
| 322 register struct window *w; | |
| 323 register int posint; | |
| 324 register struct buffer *buf; | |
|
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
325 struct text_pos top; |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
326 Lisp_Object in_window; |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
327 int fully_p; |
| 265 | 328 |
| 32937 | 329 w = decode_window (window); |
| 330 buf = XBUFFER (w->buffer); | |
| 331 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
| 332 | |
| 333 if (!NILP (pos)) | |
| 265 | 334 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
335 CHECK_NUMBER_COERCE_MARKER (pos); |
| 265 | 336 posint = XINT (pos); |
| 337 } | |
| 32937 | 338 else if (w == XWINDOW (selected_window)) |
| 339 posint = PT; | |
| 340 else | |
| 341 posint = XMARKER (w->pointm)->charpos; | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
342 |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
343 /* If position is above window start, it's not visible. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
344 if (posint < CHARPOS (top)) |
|
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
345 in_window = Qnil; |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
346 else if (XFASTINT (w->last_modified) >= BUF_MODIFF (buf) |
|
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
347 && XFASTINT (w->last_overlay_modified) >= BUF_OVERLAY_MODIFF (buf) |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
348 && posint < BUF_Z (buf) - XFASTINT (w->window_end_pos)) |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
349 { |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
350 /* If frame is up-to-date, and POSINT is < window end pos, use |
|
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
351 that info. This doesn't work for POSINT == end pos, because |
|
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
352 the window end pos is actually the position _after_ the last |
|
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
353 char in the window. */ |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
354 if (NILP (partially)) |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
355 { |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
356 pos_visible_p (w, posint, &fully_p, NILP (partially)); |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
357 in_window = fully_p ? Qt : Qnil; |
|
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
358 } |
|
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
359 else |
|
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
360 in_window = Qt; |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
361 } |
|
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
362 else if (posint > BUF_ZV (buf)) |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
363 in_window = Qnil; |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
364 else if (CHARPOS (top) < BUF_BEGV (buf) || CHARPOS (top) > BUF_ZV (buf)) |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
365 /* If window start is out of range, do something reasonable. */ |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
366 in_window = Qnil; |
| 265 | 367 else |
| 368 { | |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
369 if (pos_visible_p (w, posint, &fully_p, NILP (partially))) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
370 in_window = !NILP (partially) || fully_p ? Qt : Qnil; |
|
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
371 else |
|
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
372 in_window = Qnil; |
| 265 | 373 } |
|
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
374 |
|
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
375 return in_window; |
| 265 | 376 } |
|
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
377 |
| 265 | 378 |
| 379 static struct window * | |
| 380 decode_window (window) | |
| 381 register Lisp_Object window; | |
| 382 { | |
| 485 | 383 if (NILP (window)) |
| 265 | 384 return XWINDOW (selected_window); |
| 385 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
386 CHECK_LIVE_WINDOW (window); |
| 265 | 387 return XWINDOW (window); |
| 388 } | |
| 389 | |
| 390 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 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
|
391 doc: /* Return the buffer that WINDOW is displaying. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
392 (window) |
| 265 | 393 Lisp_Object window; |
| 394 { | |
| 395 return decode_window (window)->buffer; | |
| 396 } | |
| 397 | |
| 398 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
|
399 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
|
400 (window) |
| 265 | 401 Lisp_Object window; |
| 402 { | |
| 403 return decode_window (window)->height; | |
| 404 } | |
| 405 | |
| 406 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
|
407 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
|
408 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
|
409 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
|
410 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
|
411 (window) |
| 265 | 412 Lisp_Object window; |
| 413 { | |
|
6576
851ee89bae86
(Fwindow_width): Delete unnecessary variable declarations.
Karl Heuer <kwzh@gnu.org>
parents:
6517
diff
changeset
|
414 return make_number (window_internal_width (decode_window (window))); |
| 265 | 415 } |
| 416 | |
| 417 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
|
418 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
|
419 (window) |
| 265 | 420 Lisp_Object window; |
| 421 { | |
| 422 return decode_window (window)->hscroll; | |
| 423 } | |
| 424 | |
| 425 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
|
426 doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. |
|
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
427 NCOL should be zero or positive. |
|
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
428 |
|
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
429 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
|
430 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
|
431 (window, ncol) |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
432 Lisp_Object window, ncol; |
| 265 | 433 { |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
434 struct window *w = decode_window (window); |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
435 int hscroll; |
| 265 | 436 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
437 CHECK_NUMBER (ncol); |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
438 hscroll = max (0, XINT (ncol)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
439 |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
440 /* Prevent redisplay shortcuts when changing the hscroll. */ |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
441 if (XINT (w->hscroll) != hscroll) |
| 25375 | 442 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
443 |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
444 w->hscroll = make_number (hscroll); |
| 265 | 445 return ncol; |
| 446 } | |
| 447 | |
|
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
448 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
|
449 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
|
450 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
|
451 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
|
452 (window) |
|
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
453 Lisp_Object window; |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
454 { |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
455 return decode_window (window)->redisplay_end_trigger; |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
456 } |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
457 |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
458 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
|
459 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
|
460 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
|
461 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
|
462 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
|
463 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
|
464 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
|
465 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
|
466 (window, value) |
|
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
467 register Lisp_Object window, value; |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
468 { |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
469 register struct window *w; |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
470 |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
471 w = decode_window (window); |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
472 w->redisplay_end_trigger = value; |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
473 return value; |
|
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 |
| 265 | 476 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
|
477 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
|
478 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
479 RIGHT is one more than the rightmost column used by WINDOW, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
480 and BOTTOM is one more than the bottommost row used by WINDOW |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
481 and its mode-line. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
482 (window) |
| 265 | 483 Lisp_Object window; |
| 484 { | |
| 485 register struct window *w = decode_window (window); | |
| 486 | |
| 487 return Fcons (w->left, Fcons (w->top, | |
|
16297
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
488 Fcons (make_number (WINDOW_RIGHT_EDGE (w)), |
| 265 | 489 Fcons (make_number (XFASTINT (w->top) |
| 490 + XFASTINT (w->height)), | |
| 491 Qnil)))); | |
| 492 } | |
| 493 | |
|
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
494 /* Test if the character at column *X, row *Y is within window W. |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
495 If it is not, return ON_NOTHING; |
| 432 | 496 if it is in the window's text area, |
| 497 set *x and *y to its location relative to the upper left corner | |
| 498 of the window, and | |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
499 return ON_TEXT; |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
500 if it is on the window's modeline, return ON_MODE_LINE; |
| 432 | 501 if it is on the border between the window and its right sibling, |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
502 return ON_VERTICAL_BORDER. |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
503 if it is on the window's top line, return ON_HEADER_LINE; |
| 41127 | 504 if it is in left or right fringe of the window, |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
505 return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
506 to window-relative coordinates; |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
507 if it is in the marginal area to the left/right of the window, |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
508 return ON_LEFT_MARGIN or ON_RIGHT_MARGIN, and convert *X and *Y |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
509 to window-relative coordinates. |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
510 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
511 X and Y are frame relative pixel coordinates. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
512 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
513 static enum window_part |
| 432 | 514 coordinates_in_window (w, x, y) |
| 515 register struct window *w; | |
| 516 register int *x, *y; | |
| 517 { | |
|
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
518 /* Let's make this a global enum later, instead of using numbers |
|
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
519 everywhere. */ |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
520 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
521 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
|
522 enum window_part part; |
| 40235 | 523 int ux = CANON_X_UNIT (f); |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
524 int x0 = XFASTINT (w->left) * ux; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
525 int x1 = x0 + XFASTINT (w->width) * ux; |
|
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
526 /* 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
|
527 (Between mode lines for instance. */ |
|
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
528 int grabbable_width = ux; |
|
44649
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
529 int lmargin_width = 0, rmargin_width = 0; |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
530 |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
531 if (*x < x0 || *x >= x1) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
532 return ON_NOTHING; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
533 |
|
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
534 /* 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
|
535 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
|
536 if (w->pseudo_window_p) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
537 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
538 left_x = 0; |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
539 right_x = XFASTINT (w->width) * CANON_X_UNIT (f) - 1; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
540 top_y = WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
541 bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
542 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
543 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
544 { |
|
27850
3c13fcdeb63a
(coordinates_in_window): Take frame's internal border width
Gerd Moellmann <gerd@gnu.org>
parents:
27848
diff
changeset
|
545 left_x = (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w) |
|
28004
7e296e4ec801
(coordinates_in_window): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27956
diff
changeset
|
546 - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)); |
|
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
547 right_x = WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X (w) - 1; |
|
27850
3c13fcdeb63a
(coordinates_in_window): Take frame's internal border width
Gerd Moellmann <gerd@gnu.org>
parents:
27848
diff
changeset
|
548 top_y = (WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w) |
|
28004
7e296e4ec801
(coordinates_in_window): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27956
diff
changeset
|
549 - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
550 bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
551 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
552 |
|
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
553 /* 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
|
554 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
|
555 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
|
556 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
|
557 scroll bars. */ |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
558 |
|
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
559 if (WINDOW_WANTS_MODELINE_P (w) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
560 && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
561 && *y < bottom_y) |
|
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
562 { |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
563 /* 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
|
564 between mode lines of horizontally adjacent mode lines |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
565 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
|
566 return the right window. */ |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
567 part = ON_MODE_LINE; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
568 |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
569 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
570 { |
|
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
571 if (abs (*x - x0) < grabbable_width) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
572 part = ON_VERTICAL_BORDER; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
573 } |
|
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
574 else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < grabbable_width) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
575 part = ON_VERTICAL_BORDER; |
|
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
576 } |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
577 else if (WINDOW_WANTS_HEADER_LINE_P (w) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
578 && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
579 && *y >= top_y) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
580 { |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
581 part = ON_HEADER_LINE; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
582 |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
583 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
584 { |
|
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
585 if (abs (*x - x0) < grabbable_width) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
586 part = ON_VERTICAL_BORDER; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
587 } |
|
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
588 else if (!WINDOW_RIGHTMOST_P (w) && abs (*x - x1) < grabbable_width) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
589 part = ON_VERTICAL_BORDER; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
590 } |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
591 /* Outside anything interesting? */ |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
592 else if (*y < top_y |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
593 || *y >= bottom_y |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
594 || *x < (left_x |
|
41719
3734871037bb
(coordinates_in_window): Handle separate left and right fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41503
diff
changeset
|
595 - FRAME_LEFT_FRINGE_WIDTH (f) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
596 - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * ux) |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
597 || *x > (right_x |
|
41719
3734871037bb
(coordinates_in_window): Handle separate left and right fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41503
diff
changeset
|
598 + FRAME_RIGHT_FRINGE_WIDTH (f) |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
599 + FRAME_RIGHT_SCROLL_BAR_WIDTH (f) * ux)) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
600 { |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
601 part = ON_NOTHING; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
602 } |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
603 else if (FRAME_WINDOW_P (f)) |
|
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
604 { |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
605 if (!w->pseudo_window_p |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
606 && !FRAME_HAS_VERTICAL_SCROLL_BARS (f) |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
607 && !WINDOW_RIGHTMOST_P (w) |
|
41719
3734871037bb
(coordinates_in_window): Handle separate left and right fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41503
diff
changeset
|
608 && (abs (*x - right_x - FRAME_RIGHT_FRINGE_WIDTH (f)) < grabbable_width)) |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
609 { |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
610 part = ON_VERTICAL_BORDER; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
611 } |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
612 else if (*x < left_x || *x > right_x) |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
613 { |
| 41127 | 614 /* Other lines than the mode line don't include fringes and |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
615 scroll bars on the left. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
616 |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
617 /* Convert X and Y to window-relative pixel coordinates. */ |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
618 *x -= left_x; |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
619 *y -= top_y; |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
620 part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
621 } |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
622 else |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
623 { |
|
44649
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
624 lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
625 rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
626 /* You can never be on a margin area if its width is zero. */ |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
627 if (lmargin_width |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
628 && *x <= window_box_right (w, LEFT_MARGIN_AREA)) |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
629 part = ON_LEFT_MARGIN; |
|
44649
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
630 else if (rmargin_width |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
631 && *x >= window_box_left (w, RIGHT_MARGIN_AREA)) |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
632 part = ON_RIGHT_MARGIN; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
633 else |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
634 { |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
635 part = ON_TEXT; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
636 *x -= left_x; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
637 *y -= top_y; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
638 } |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
639 } |
|
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
640 } |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
641 else |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
642 { |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
643 /* 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
|
644 terminals, the vertical line's x coordinate is right_x. */ |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
645 if (*x < left_x || *x > right_x) |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
646 { |
| 41127 | 647 /* Other lines than the mode line don't include fringes and |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
648 scroll bars on the left. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
649 |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
650 /* Convert X and Y to window-relative pixel coordinates. */ |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
651 *x -= left_x; |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
652 *y -= top_y; |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
653 part = *x < left_x ? ON_LEFT_FRINGE : ON_RIGHT_FRINGE; |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
654 } |
|
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
655 /* Here, too, "*x > right_x" is because of character terminals. */ |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
656 else if (!w->pseudo_window_p |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
657 && !WINDOW_RIGHTMOST_P (w) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
658 && *x > right_x - ux) |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
659 { |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
660 /* 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
|
661 this area begins at RIGHT_X minus a canonical char width. */ |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
662 part = ON_VERTICAL_BORDER; |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
663 } |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
664 else |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
665 { |
|
44649
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
666 lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
667 rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
668 /* You can never be on a margin area if its width is zero. |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
669 This is especially important for character terminals. */ |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
670 if (lmargin_width |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
671 && *x <= window_box_right (w, LEFT_MARGIN_AREA)) |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
672 part = ON_LEFT_MARGIN; |
|
44649
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
673 else if (rmargin_width |
|
1bb925387b48
(coordinates_in_window): Don't report on margin area if its width is zero.
Eli Zaretskii <eliz@gnu.org>
parents:
44535
diff
changeset
|
674 && *x >= window_box_left (w, RIGHT_MARGIN_AREA)) |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
675 part = ON_RIGHT_MARGIN; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
676 else |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
677 { |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
678 part = ON_TEXT; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
679 /* Convert X and Y to window-relative pixel coordinates. */ |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
680 *x -= left_x; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
681 *y -= top_y; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
682 } |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
683 } |
|
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
684 } |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
685 |
|
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
686 return part; |
| 432 | 687 } |
| 688 | |
|
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
689 |
| 432 | 690 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
|
691 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
|
692 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
|
693 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
|
694 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
|
695 \(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
|
696 frame. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
697 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
|
698 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
|
699 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
|
700 If they are in the top mode line of WINDOW, `header-line' is returned. |
| 41127 | 701 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
| 702 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
|
703 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
|
704 `vertical-line' is returned. |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
705 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
|
706 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
|
707 (coordinates, window) |
| 432 | 708 register Lisp_Object coordinates, window; |
| 709 { | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
710 struct window *w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
711 struct frame *f; |
| 432 | 712 int x, y; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
713 Lisp_Object lx, ly; |
| 432 | 714 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
715 CHECK_LIVE_WINDOW (window); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
716 w = XWINDOW (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
717 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
|
718 CHECK_CONS (coordinates); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
719 lx = Fcar (coordinates); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
720 ly = Fcdr (coordinates); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
721 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
|
722 CHECK_NUMBER_OR_FLOAT (ly); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
723 x = PIXEL_X_FROM_CANON_X (f, lx); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
724 y = PIXEL_Y_FROM_CANON_Y (f, ly); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
725 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
726 switch (coordinates_in_window (w, &x, &y)) |
| 432 | 727 { |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
728 case ON_NOTHING: |
| 432 | 729 return Qnil; |
| 730 | |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
731 case ON_TEXT: |
|
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
732 /* 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
|
733 them to canonical char units before returning them. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
734 return Fcons (CANON_X_FROM_PIXEL_X (f, x), |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
735 CANON_Y_FROM_PIXEL_Y (f, y)); |
| 432 | 736 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
737 case ON_MODE_LINE: |
| 432 | 738 return Qmode_line; |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
739 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
740 case ON_VERTICAL_BORDER: |
| 732 | 741 return Qvertical_line; |
| 432 | 742 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
743 case ON_HEADER_LINE: |
| 25546 | 744 return Qheader_line; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
745 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
746 case ON_LEFT_FRINGE: |
|
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
747 return Qleft_fringe; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
748 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
749 case ON_RIGHT_FRINGE: |
|
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
750 return Qright_fringe; |
|
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
751 |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
752 case ON_LEFT_MARGIN: |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
753 return Qleft_margin; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
754 |
|
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
755 case ON_RIGHT_MARGIN: |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
756 return Qright_margin; |
|
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
757 |
| 432 | 758 default: |
| 759 abort (); | |
| 760 } | |
| 761 } | |
| 762 | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
763 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
764 /* 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
|
765 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
|
766 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
|
767 |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
768 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
|
769 does, return W in *CW->window, as Lisp_Object, and return in |
| 30777 | 770 *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
|
771 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
|
772 |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
773 struct check_window_data |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
774 { |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
775 Lisp_Object *window; |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
776 int *x, *y; |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
777 enum window_part *part; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
778 }; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
779 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
780 static int |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
781 check_window_containing (w, user_data) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
782 struct window *w; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
783 void *user_data; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
784 { |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
785 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
|
786 enum window_part found; |
|
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
787 int continue_p = 1; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
788 |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
789 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
|
790 if (found != ON_NOTHING) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
791 { |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
792 *cw->part = found; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
793 XSETWINDOW (*cw->window, w); |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
794 continue_p = 0; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
795 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
796 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
797 return continue_p; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
798 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
799 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
800 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
801 /* Find the window containing frame-relative pixel position X/Y and |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
802 return it as a Lisp_Object. If X, Y is on one of the window's |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
803 special `window_part' elements, set *PART to the id of that element. |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
804 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
|
805 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
|
806 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
807 This function was previously implemented with a loop cycling over |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
808 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
|
809 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
|
810 implementation of next_window using Vwindow_list, because |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
811 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
|
812 tree of F when this function is called asynchronously from |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
813 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
|
814 case. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
815 |
| 265 | 816 Lisp_Object |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
817 window_from_coordinates (f, x, y, part, tool_bar_p) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
818 struct frame *f; |
| 265 | 819 int x, y; |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
820 enum window_part *part; |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
821 int tool_bar_p; |
| 265 | 822 { |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
823 Lisp_Object window; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
824 struct check_window_data cw; |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
825 enum window_part dummy; |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
826 |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
827 if (part == 0) |
|
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
828 part = &dummy; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
829 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
830 window = Qnil; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
831 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
|
832 foreach_window (f, check_window_containing, &cw); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
833 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
834 /* 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
|
835 bar exists. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
836 if (NILP (window) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
837 && tool_bar_p |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
838 && WINDOWP (f->tool_bar_window) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
839 && XINT (XWINDOW (f->tool_bar_window)->height) > 0 |
|
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
840 && (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
|
841 != ON_NOTHING)) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
842 { |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
843 *part = ON_TEXT; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
844 window = f->tool_bar_window; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
845 } |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
846 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
847 return window; |
| 265 | 848 } |
| 849 | |
|
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
850 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
|
851 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
|
852 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
|
853 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
|
854 column 0. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
855 (x, y, frame) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
856 Lisp_Object x, y, frame; |
| 265 | 857 { |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
858 struct frame *f; |
| 265 | 859 |
| 769 | 860 if (NILP (frame)) |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
861 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
862 CHECK_LIVE_FRAME (frame); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
863 f = XFRAME (frame); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
864 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
865 /* 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
|
866 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
|
867 CHECK_NUMBER_OR_FLOAT (y); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
868 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
869 return window_from_coordinates (f, |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
870 PIXEL_X_FROM_CANON_X (f, x), |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
871 PIXEL_Y_FROM_CANON_Y (f, y), |
|
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
872 0, 0); |
| 265 | 873 } |
| 874 | |
| 875 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
|
876 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
|
877 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
|
878 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
|
879 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
880 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
|
881 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
|
882 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
|
883 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
|
884 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
|
885 (window) |
| 265 | 886 Lisp_Object window; |
| 887 { | |
| 888 register struct window *w = decode_window (window); | |
| 889 | |
| 890 if (w == XWINDOW (selected_window) | |
| 891 && current_buffer == XBUFFER (w->buffer)) | |
| 892 return Fpoint (); | |
| 893 return Fmarker_position (w->pointm); | |
| 894 } | |
| 895 | |
| 896 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
|
897 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
|
898 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
|
899 (window) |
| 265 | 900 Lisp_Object window; |
| 901 { | |
| 902 return Fmarker_position (decode_window (window)->start); | |
| 903 } | |
| 904 | |
|
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
905 /* 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
|
906 |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
907 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
|
908 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
|
909 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
|
910 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
|
911 (save-excursion |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
912 (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
|
913 (vertical-motion (1- (window-height window)) window) |
|
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
914 (point))") */ |
|
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
915 |
|
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
916 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
|
917 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
|
918 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
|
919 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
|
920 does not update this value. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
921 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
|
922 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
|
923 (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
|
924 Lisp_Object window, update; |
| 265 | 925 { |
| 926 Lisp_Object value; | |
| 927 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
|
928 Lisp_Object buf; |
|
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
929 |
|
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
930 buf = w->buffer; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
931 CHECK_BUFFER (buf); |
|
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
932 |
|
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
933 #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
|
934 /* 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
|
935 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
|
936 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
|
937 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
|
938 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
|
939 return Qnil; |
|
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
940 #endif |
|
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
941 |
|
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
942 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
|
943 && ! (! NILP (w->window_end_valid) |
|
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
944 && XFASTINT (w->last_modified) >= MODIFF)) |
|
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
945 { |
|
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
946 struct text_pos startp; |
|
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
947 struct it it; |
|
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
948 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
|
949 |
|
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
950 /* 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
|
951 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
|
952 `-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
|
953 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
|
954 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
|
955 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
|
956 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
|
957 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
|
958 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
|
959 else |
|
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
960 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
|
961 |
|
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
962 /* 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
|
963 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
|
964 if (b != current_buffer) |
|
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
965 { |
|
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
966 old_buffer = current_buffer; |
|
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
967 set_buffer_internal (b); |
|
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
968 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
969 |
|
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
970 start_display (&it, w, startp); |
|
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
971 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
|
972 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
|
973 move_it_past_eol (&it); |
|
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
974 value = make_number (IT_CHARPOS (it)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
975 |
|
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
976 if (old_buffer) |
|
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
977 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
|
978 } |
|
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
979 else |
|
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
980 XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos)); |
| 265 | 981 |
| 982 return value; | |
| 983 } | |
| 984 | |
| 985 DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 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
|
986 doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
987 (window, pos) |
| 265 | 988 Lisp_Object window, pos; |
| 989 { | |
| 990 register struct window *w = decode_window (window); | |
| 991 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
992 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
|
993 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
|
994 && XBUFFER (w->buffer) == current_buffer) |
| 265 | 995 Fgoto_char (pos); |
| 996 else | |
| 997 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
|
998 |
|
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
999 /* 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
|
1000 the new value of point. */ |
|
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1001 if (!EQ (window, selected_window)) |
|
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1002 ++windows_or_buffers_changed; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1003 |
| 265 | 1004 return pos; |
| 1005 } | |
| 1006 | |
| 1007 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
|
1008 doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1009 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
|
1010 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
|
1011 (window, pos, noforce) |
| 265 | 1012 Lisp_Object window, pos, noforce; |
| 1013 { | |
| 1014 register struct window *w = decode_window (window); | |
| 1015 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1016 CHECK_NUMBER_COERCE_MARKER (pos); |
| 265 | 1017 set_marker_restricted (w->start, pos, w->buffer); |
| 1018 /* this is not right, but much easier than doing what is right. */ | |
| 1019 w->start_at_line_beg = Qnil; | |
| 485 | 1020 if (NILP (noforce)) |
| 265 | 1021 w->force_start = Qt; |
| 1022 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
|
1023 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
|
1024 XSETFASTINT (w->last_overlay_modified, 0); |
| 338 | 1025 if (!EQ (window, selected_window)) |
| 1026 windows_or_buffers_changed++; | |
|
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1027 |
| 265 | 1028 return pos; |
| 1029 } | |
| 1030 | |
| 1031 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
| 1032 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
|
1033 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
|
1034 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
|
1035 (window) |
| 265 | 1036 Lisp_Object window; |
| 1037 { | |
| 1038 return decode_window (window)->dedicated; | |
| 1039 } | |
| 1040 | |
|
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1041 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
|
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1042 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
|
1043 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
|
1044 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
|
1045 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
|
1046 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
|
1047 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
|
1048 (window, arg) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1049 Lisp_Object window, arg; |
| 265 | 1050 { |
| 1051 register struct window *w = decode_window (window); | |
| 1052 | |
| 485 | 1053 if (NILP (arg)) |
| 265 | 1054 w->dedicated = Qnil; |
| 1055 else | |
|
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1056 w->dedicated = Qt; |
| 265 | 1057 |
| 1058 return w->dedicated; | |
| 1059 } | |
| 1060 | |
| 1061 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, | |
| 1062 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
|
1063 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
|
1064 (window) |
| 265 | 1065 Lisp_Object window; |
| 1066 { | |
| 1067 return decode_window (window)->display_table; | |
| 1068 } | |
| 1069 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1070 /* 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
|
1071 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
|
1072 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
|
1073 return 0. */ |
| 265 | 1074 |
|
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1075 struct Lisp_Char_Table * |
| 265 | 1076 window_display_table (w) |
| 1077 struct window *w; | |
| 1078 { | |
|
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1079 struct Lisp_Char_Table *dp = NULL; |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1080 |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1081 if (DISP_TABLE_P (w->display_table)) |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1082 dp = XCHAR_TABLE (w->display_table); |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1083 else if (BUFFERP (w->buffer)) |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1084 { |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1085 struct buffer *b = XBUFFER (w->buffer); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1086 |
|
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1087 if (DISP_TABLE_P (b->display_table)) |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1088 dp = XCHAR_TABLE (b->display_table); |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1089 else if (DISP_TABLE_P (Vstandard_display_table)) |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1090 dp = XCHAR_TABLE (Vstandard_display_table); |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1091 } |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1092 |
|
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1093 return dp; |
| 265 | 1094 } |
| 1095 | |
| 555 | 1096 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
|
1097 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
|
1098 (window, table) |
| 265 | 1099 register Lisp_Object window, table; |
| 1100 { | |
| 1101 register struct window *w; | |
| 1102 | |
| 1103 w = decode_window (window); | |
| 1104 w->display_table = table; | |
| 1105 return table; | |
| 1106 } | |
| 1107 | |
| 1108 /* Record info on buffer window w is displaying | |
| 1109 when it is about to cease to display that buffer. */ | |
| 21514 | 1110 static void |
| 265 | 1111 unshow_buffer (w) |
| 1112 register struct window *w; | |
| 1113 { | |
|
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1114 Lisp_Object buf; |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1115 struct buffer *b; |
|
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1116 |
|
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1117 buf = w->buffer; |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1118 b = XBUFFER (buf); |
|
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1119 if (b != XMARKER (w->pointm)->buffer) |
| 265 | 1120 abort (); |
| 1121 | |
|
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1122 #if 0 |
| 265 | 1123 if (w == XWINDOW (selected_window) |
| 1124 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
| 1125 /* Do this except when the selected window's buffer | |
| 1126 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
|
1127 #endif |
|
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1128 /* 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
|
1129 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
|
1130 Now that this statement is unconditional, |
|
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1131 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
|
1132 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
|
1133 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
|
1134 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
|
1135 b->last_window_start = marker_position (w->start); |
| 265 | 1136 |
| 1137 /* Point in the selected window's buffer | |
| 1138 is actually stored in that buffer, and the window's pointm isn't used. | |
| 1139 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
|
1140 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
|
1141 /* 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
|
1142 && !(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
|
1143 && 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
|
1144 && 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
|
1145 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
|
1146 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
|
1147 XMARKER (w->pointm)->charpos, |
|
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1148 BUF_ZV (b)), |
|
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1149 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
|
1150 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
|
1151 BUF_ZV_BYTE (b))); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1152 |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1153 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
|
1154 && 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
|
1155 b->last_selected_window = Qnil; |
| 265 | 1156 } |
| 1157 | |
| 1158 /* Put replacement into the window structure in place of old. */ | |
| 21514 | 1159 static void |
| 265 | 1160 replace_window (old, replacement) |
| 1161 Lisp_Object old, replacement; | |
| 1162 { | |
| 1163 register Lisp_Object tem; | |
| 1164 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
| 1165 | |
| 769 | 1166 /* If OLD is its frame's root_window, then replacement is the new |
| 1167 root_window for that frame. */ | |
| 265 | 1168 |
|
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1169 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
| 769 | 1170 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
| 265 | 1171 |
| 1172 p->left = o->left; | |
| 1173 p->top = o->top; | |
| 1174 p->width = o->width; | |
| 1175 p->height = o->height; | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1176 p->desired_matrix = p->current_matrix = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1177 p->vscroll = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1178 bzero (&p->cursor, sizeof (p->cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1179 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1180 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1181 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
|
1182 p->phys_cursor_width = -1; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1183 p->must_be_updated_p = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1184 p->pseudo_window_p = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1185 XSETFASTINT (p->window_end_vpos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1186 XSETFASTINT (p->window_end_pos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1187 p->window_end_valid = Qnil; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1188 p->frozen_window_start_p = 0; |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
1189 p->orig_top = p->orig_height = Qnil; |
| 265 | 1190 |
| 1191 p->next = tem = o->next; | |
| 485 | 1192 if (!NILP (tem)) |
| 265 | 1193 XWINDOW (tem)->prev = replacement; |
| 1194 | |
| 1195 p->prev = tem = o->prev; | |
| 485 | 1196 if (!NILP (tem)) |
| 265 | 1197 XWINDOW (tem)->next = replacement; |
| 1198 | |
| 1199 p->parent = tem = o->parent; | |
| 485 | 1200 if (!NILP (tem)) |
| 265 | 1201 { |
| 1202 if (EQ (XWINDOW (tem)->vchild, old)) | |
| 1203 XWINDOW (tem)->vchild = replacement; | |
| 1204 if (EQ (XWINDOW (tem)->hchild, old)) | |
| 1205 XWINDOW (tem)->hchild = replacement; | |
| 1206 } | |
| 1207 | |
| 1208 /*** Here, if replacement is a vertical combination | |
| 1209 and so is its new parent, we should make replacement's | |
| 1210 children be children of that parent instead. ***/ | |
| 1211 } | |
| 1212 | |
| 1213 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
|
1214 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
|
1215 (window) |
| 265 | 1216 register Lisp_Object window; |
| 1217 { | |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1218 delete_window (window); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1219 |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1220 if (! NILP (Vwindow_configuration_change_hook) |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1221 && ! NILP (Vrun_hooks)) |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1222 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1223 |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1224 return Qnil; |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1225 } |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1226 |
| 20351 | 1227 void |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1228 delete_window (window) |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1229 register Lisp_Object window; |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1230 { |
| 265 | 1231 register Lisp_Object tem, parent, sib; |
| 1232 register struct window *p; | |
| 1233 register struct window *par; | |
|
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1234 struct frame *f; |
| 265 | 1235 |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1236 /* 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
|
1237 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
|
1238 so we can't decode_window here. */ |
| 485 | 1239 if (NILP (window)) |
| 265 | 1240 window = selected_window; |
| 1241 else | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1242 CHECK_WINDOW (window); |
| 265 | 1243 p = XWINDOW (window); |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1244 |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1245 /* It's okay to delete an already-deleted window. */ |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1246 if (NILP (p->buffer) |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1247 && NILP (p->hchild) |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1248 && NILP (p->vchild)) |
|
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1249 return; |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1250 |
| 265 | 1251 parent = p->parent; |
| 485 | 1252 if (NILP (parent)) |
| 265 | 1253 error ("Attempt to delete minibuffer or sole ordinary window"); |
| 1254 par = XWINDOW (parent); | |
| 1255 | |
| 1256 windows_or_buffers_changed++; | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1257 Vwindow_list = Qnil; |
|
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1258 f = XFRAME (WINDOW_FRAME (p)); |
|
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1259 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
| 265 | 1260 |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1261 /* 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
|
1262 { |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1263 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
|
1264 |
|
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1265 /* 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
|
1266 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
|
1267 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
|
1268 swindow = FRAME_SELECTED_WINDOW (f); |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1269 |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1270 while (1) |
|
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1271 { |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1272 pwindow = swindow; |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1273 while (!NILP (pwindow)) |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1274 { |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1275 if (EQ (window, pwindow)) |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1276 break; |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1277 pwindow = XWINDOW (pwindow)->parent; |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1278 } |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1279 |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1280 /* 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
|
1281 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
|
1282 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
|
1283 break; |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1284 /* 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
|
1285 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
|
1286 |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1287 /* 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
|
1288 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
|
1289 so we cannot delete. */ |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1290 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
|
1291 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
|
1292 } |
|
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1293 |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1294 /* 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
|
1295 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
|
1296 { |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1297 /* 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
|
1298 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
|
1299 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
|
1300 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
|
1301 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
|
1302 if (EQ (FRAME_SELECTED_WINDOW (f), selected_window)) |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1303 Fselect_window (swindow); |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1304 else |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1305 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
|
1306 } |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1307 } |
| 265 | 1308 |
| 1309 tem = p->buffer; | |
| 1310 /* tem is null for dummy parent windows | |
| 1311 (which have inferiors but not any contents themselves) */ | |
| 485 | 1312 if (!NILP (tem)) |
| 265 | 1313 { |
| 1314 unshow_buffer (p); | |
| 1315 unchain_marker (p->pointm); | |
| 1316 unchain_marker (p->start); | |
| 1317 } | |
| 1318 | |
|
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1319 /* 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
|
1320 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
|
1321 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
|
1322 processed while we are changing them. */ |
|
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1323 BLOCK_INPUT; |
|
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1324 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1325 |
| 265 | 1326 tem = p->next; |
| 485 | 1327 if (!NILP (tem)) |
| 265 | 1328 XWINDOW (tem)->prev = p->prev; |
| 1329 | |
| 1330 tem = p->prev; | |
| 485 | 1331 if (!NILP (tem)) |
| 265 | 1332 XWINDOW (tem)->next = p->next; |
| 1333 | |
| 1334 if (EQ (window, par->hchild)) | |
| 1335 par->hchild = p->next; | |
| 1336 if (EQ (window, par->vchild)) | |
| 1337 par->vchild = p->next; | |
| 1338 | |
| 1339 /* Find one of our siblings to give our space to. */ | |
| 1340 sib = p->prev; | |
| 485 | 1341 if (NILP (sib)) |
| 265 | 1342 { |
| 1343 /* If p gives its space to its next sibling, that sibling needs | |
| 1344 to have its top/left side pulled back to where p's is. | |
| 1345 set_window_{height,width} will re-position the sibling's | |
| 1346 children. */ | |
| 1347 sib = p->next; | |
|
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1348 XWINDOW (sib)->top = p->top; |
|
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1349 XWINDOW (sib)->left = p->left; |
| 265 | 1350 } |
| 1351 | |
| 1352 /* Stretch that sibling. */ | |
| 485 | 1353 if (!NILP (par->vchild)) |
| 265 | 1354 set_window_height (sib, |
| 1355 XFASTINT (XWINDOW (sib)->height) + XFASTINT (p->height), | |
| 1356 1); | |
| 485 | 1357 if (!NILP (par->hchild)) |
| 265 | 1358 set_window_width (sib, |
| 1359 XFASTINT (XWINDOW (sib)->width) + XFASTINT (p->width), | |
| 1360 1); | |
| 1361 | |
| 1362 /* If parent now has only one child, | |
| 1363 put the child into the parent's place. */ | |
| 1364 tem = par->hchild; | |
| 485 | 1365 if (NILP (tem)) |
| 265 | 1366 tem = par->vchild; |
| 485 | 1367 if (NILP (XWINDOW (tem)->next)) |
| 265 | 1368 replace_window (parent, tem); |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1369 |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1370 /* 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
|
1371 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
|
1372 if (! NILP (p->hchild)) |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1373 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
|
1374 else if (! NILP (p->vchild)) |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1375 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
|
1376 |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1377 /* Mark this window as deleted. */ |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1378 p->buffer = p->hchild = p->vchild = Qnil; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1379 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1380 /* Adjust glyph matrices. */ |
|
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1381 adjust_glyphs (f); |
|
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1382 UNBLOCK_INPUT; |
| 265 | 1383 } |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1384 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1385 |
| 265 | 1386 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1387 /*********************************************************************** |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1388 Window List |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1389 ***********************************************************************/ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1390 |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1391 /* 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
|
1392 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
|
1393 function window_list. */ |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1394 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1395 static int |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1396 add_window_to_list (w, user_data) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1397 struct window *w; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1398 void *user_data; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1399 { |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1400 Lisp_Object *list = (Lisp_Object *) user_data; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1401 Lisp_Object window; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1402 XSETWINDOW (window, w); |
|
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1403 *list = Fcons (window, *list); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1404 return 1; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1405 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1406 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1407 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1408 /* 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
|
1409 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
|
1410 list, cache it in Vwindow_list, and return that. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1411 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1412 static Lisp_Object |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1413 window_list () |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1414 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1415 if (!CONSP (Vwindow_list)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1416 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1417 Lisp_Object tail; |
|
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1418 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1419 Vwindow_list = Qnil; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1420 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
|
1421 { |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1422 Lisp_Object args[2]; |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1423 |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1424 /* 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
|
1425 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
|
1426 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
|
1427 args[1] = Qnil; |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1428 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
|
1429 args[0] = Vwindow_list; |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1430 args[1] = Fnreverse (args[1]); |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1431 Vwindow_list = Fnconc (2, args); |
|
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1432 } |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1433 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1434 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1435 return Vwindow_list; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1436 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1437 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1438 |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1439 /* 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
|
1440 OWINDOW, MINIBUF and ALL_FRAMES. |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1441 |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1442 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
|
1443 `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
|
1444 a window means a specific minibuffer window |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1445 |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1446 ALL_FRAMES t means search all frames, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1447 nil means search just current frame, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1448 `visible' means search just visible frames, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1449 0 means search visible and iconified frames, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1450 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
|
1451 a frame means consider windows on that frame, only. */ |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1452 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1453 static int |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1454 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
|
1455 Lisp_Object window, owindow, minibuf, all_frames; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1456 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1457 struct window *w = XWINDOW (window); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1458 struct frame *f = XFRAME (w->frame); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1459 int candidate_p = 1; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1460 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1461 if (!BUFFERP (w->buffer)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1462 candidate_p = 0; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1463 else if (MINI_WINDOW_P (w) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1464 && (EQ (minibuf, Qlambda) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1465 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1466 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1467 /* If MINIBUF is `lambda' don't consider any mini-windows. |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1468 If it is a window, consider only that one. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1469 candidate_p = 0; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1470 } |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1471 else if (EQ (all_frames, Qt)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1472 candidate_p = 1; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1473 else if (NILP (all_frames)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1474 { |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1475 xassert (WINDOWP (owindow)); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1476 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
|
1477 } |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1478 else if (EQ (all_frames, Qvisible)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1479 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1480 FRAME_SAMPLE_VISIBILITY (f); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1481 candidate_p = FRAME_VISIBLE_P (f); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1482 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1483 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1484 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1485 FRAME_SAMPLE_VISIBILITY (f); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1486 candidate_p = FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1487 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1488 else if (WINDOWP (all_frames)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1489 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1490 || EQ (XWINDOW (all_frames)->frame, w->frame) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1491 || 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
|
1492 else if (FRAMEP (all_frames)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1493 candidate_p = EQ (all_frames, w->frame); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1494 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1495 return candidate_p; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1496 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1497 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1498 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1499 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1500 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
|
1501 ALL_FRAMES. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1502 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1503 static void |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1504 decode_next_window_args (window, minibuf, all_frames) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1505 Lisp_Object *window, *minibuf, *all_frames; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1506 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1507 if (NILP (*window)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1508 *window = selected_window; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1509 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1510 CHECK_LIVE_WINDOW (*window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1511 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1512 /* 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
|
1513 does. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1514 if (NILP (*minibuf)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1515 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1516 else if (!EQ (*minibuf, Qt)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1517 *minibuf = Qlambda; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1518 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1519 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1520 => count none of them, or a specific minibuffer window (the |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1521 active one) to count. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1522 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1523 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1524 if (NILP (*all_frames)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1525 *all_frames = (!EQ (*minibuf, Qlambda) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1526 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1527 : Qnil); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1528 else if (EQ (*all_frames, Qvisible)) |
|
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 else if (XFASTINT (*all_frames) == 0) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1531 ; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1532 else if (FRAMEP (*all_frames)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1533 ; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1534 else if (!EQ (*all_frames, Qt)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1535 *all_frames = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1536 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1537 /* 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
|
1538 search just current frame, `visible' meaning search just visible |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1539 frames, 0 meaning search visible and iconified frames, or a |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1540 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
|
1541 frame, meaning consider windows on that frame, only. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1542 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1543 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1544 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1545 /* 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
|
1546 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
|
1547 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
|
1548 ALL_FRAMES. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1549 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1550 static Lisp_Object |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1551 next_window (window, minibuf, all_frames, next_p) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1552 Lisp_Object window, minibuf, all_frames; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1553 int next_p; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1554 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1555 decode_next_window_args (&window, &minibuf, &all_frames); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1556 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1557 /* 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
|
1558 return the first window on the frame. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1559 if (FRAMEP (all_frames) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1560 && !EQ (all_frames, XWINDOW (window)->frame)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1561 return Fframe_first_window (all_frames); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1562 |
|
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1563 if (next_p) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1564 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1565 Lisp_Object list; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1566 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1567 /* Find WINDOW in the list of all windows. */ |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1568 list = Fmemq (window, window_list ()); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1569 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1570 /* 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
|
1571 if (CONSP (list)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1572 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
|
1573 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
|
1574 break; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1575 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1576 /* 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
|
1577 if (!CONSP (list)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1578 for (list = Vwindow_list; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1579 CONSP (list) && !EQ (XCAR (list), window); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1580 list = XCDR (list)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1581 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
|
1582 break; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1583 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1584 if (CONSP (list)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1585 window = XCAR (list); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1586 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1587 else |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1588 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1589 Lisp_Object candidate, list; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1590 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1591 /* 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
|
1592 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
|
1593 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
|
1594 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
|
1595 candidate = Qnil; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1596 for (list = window_list (); CONSP (list); list = XCDR (list)) |
|
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 if (EQ (XCAR (list), window)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1599 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1600 if (WINDOWP (candidate)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1601 break; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1602 } |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1603 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
|
1604 all_frames)) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1605 candidate = XCAR (list); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1606 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1607 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1608 if (WINDOWP (candidate)) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1609 window = candidate; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1610 } |
|
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 return window; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1613 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1614 |
| 432 | 1615 |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1616 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
|
1617 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
|
1618 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
|
1619 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1620 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
|
1621 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
|
1622 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
|
1623 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
|
1624 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1625 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
|
1626 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
|
1627 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
|
1628 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
|
1629 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
|
1630 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1631 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
|
1632 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
|
1633 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
|
1634 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
|
1635 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
|
1636 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
|
1637 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1638 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
|
1639 `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
|
1640 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
|
1641 `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
|
1642 (window, minibuf, all_frames) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1643 Lisp_Object window, minibuf, all_frames; |
| 265 | 1644 { |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1645 return next_window (window, minibuf, all_frames, 1); |
| 265 | 1646 } |
| 1647 | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1648 |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1649 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
|
1650 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
|
1651 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
|
1652 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1653 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
|
1654 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
|
1655 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
|
1656 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
|
1657 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1658 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
|
1659 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
|
1660 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
|
1661 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
|
1662 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
|
1663 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1664 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
|
1665 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
|
1666 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
|
1667 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
|
1668 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
|
1669 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
|
1670 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1671 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
|
1672 `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
|
1673 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
|
1674 `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
|
1675 (window, minibuf, all_frames) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1676 Lisp_Object window, minibuf, all_frames; |
| 265 | 1677 { |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1678 return next_window (window, minibuf, all_frames, 0); |
| 265 | 1679 } |
| 1680 | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1681 |
| 338 | 1682 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
|
1683 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
|
1684 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
|
1685 This command selects the window ARG steps away in that order. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1686 A negative ARG moves in the opposite order. If the optional second |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1687 argument ALL_FRAMES is non-nil, cycle through all frames. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1688 (arg, all_frames) |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1689 Lisp_Object arg, all_frames; |
| 265 | 1690 { |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1691 Lisp_Object window; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1692 int i; |
| 265 | 1693 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1694 CHECK_NUMBER (arg); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1695 window = selected_window; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1696 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1697 for (i = XINT (arg); i > 0; --i) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1698 window = Fnext_window (window, Qnil, all_frames); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1699 for (; i < 0; ++i) |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1700 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
|
1701 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1702 Fselect_window (window); |
| 265 | 1703 return Qnil; |
| 1704 } | |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1705 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1706 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1707 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
|
1708 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
|
1709 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
|
1710 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
|
1711 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
|
1712 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
|
1713 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
|
1714 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
|
1715 (frame, minibuf, window) |
|
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1716 Lisp_Object frame, minibuf, window; |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1717 { |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1718 if (NILP (window)) |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1719 window = selected_window; |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1720 if (NILP (frame)) |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1721 frame = selected_frame; |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1722 |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1723 if (!EQ (frame, XWINDOW (window)->frame)) |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1724 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
|
1725 |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1726 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
|
1727 } |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1728 |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1729 |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1730 /* 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
|
1731 for `next-window'. */ |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1732 |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1733 static Lisp_Object |
|
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1734 window_list_1 (window, minibuf, all_frames) |
|
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
1735 Lisp_Object window, minibuf, all_frames; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1736 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1737 Lisp_Object tail, list; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1738 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1739 decode_next_window_args (&window, &minibuf, &all_frames); |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1740 list = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1741 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1742 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
|
1743 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
|
1744 list = Fcons (XCAR (tail), list); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1745 |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1746 return Fnreverse (list); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1747 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1748 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1749 |
| 265 | 1750 |
| 1751 /* Look at all windows, performing an operation specified by TYPE | |
| 1752 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
|
1753 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
|
1754 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
|
1755 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
|
1756 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
|
1757 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
| 265 | 1758 |
| 1759 enum window_loop | |
| 1760 { | |
| 1761 WINDOW_LOOP_UNUSED, | |
| 1762 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
| 1763 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
| 1764 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
| 1765 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
| 1766 GET_LARGEST_WINDOW, | |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1767 UNSHOW_BUFFER, /* Arg is buffer */ |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1768 CHECK_ALL_WINDOWS |
| 265 | 1769 }; |
| 1770 | |
| 1771 static Lisp_Object | |
| 769 | 1772 window_loop (type, obj, mini, frames) |
| 265 | 1773 enum window_loop type; |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1774 Lisp_Object obj, frames; |
| 265 | 1775 int mini; |
| 1776 { | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1777 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
|
1778 struct frame *f; |
|
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
1779 struct gcpro gcpro1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1780 |
| 769 | 1781 /* If we're only looping through windows on a particular frame, |
| 1782 frame points to that frame. If we're looping through windows | |
| 1783 on all frames, frame is 0. */ | |
| 1784 if (FRAMEP (frames)) | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1785 f = XFRAME (frames); |
| 769 | 1786 else if (NILP (frames)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1787 f = SELECTED_FRAME (); |
| 265 | 1788 else |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1789 f = NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1790 |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1791 if (f) |
|
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1792 frame_arg = Qlambda; |
|
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1793 else if (XFASTINT (frames) == 0) |
|
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1794 frame_arg = frames; |
|
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1795 else if (EQ (frames, Qvisible)) |
|
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1796 frame_arg = frames; |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1797 else |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1798 frame_arg = Qt; |
| 265 | 1799 |
|
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1800 /* 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
|
1801 Qvisible to consider all visible frames, |
|
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1802 or Qt otherwise. */ |
|
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1803 |
| 265 | 1804 /* 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
|
1805 if (WINDOWP (obj)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1806 window = obj; |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1807 else if (f) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1808 window = FRAME_SELECTED_WINDOW (f); |
| 265 | 1809 else |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1810 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
|
1811 |
|
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1812 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
|
1813 GCPRO1 (windows); |
| 265 | 1814 best_window = Qnil; |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1815 |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1816 for (; CONSP (windows); windows = CDR (windows)) |
| 265 | 1817 { |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1818 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1819 |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1820 window = XCAR (windows); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1821 w = XWINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1822 |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1823 /* 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
|
1824 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
|
1825 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
|
1826 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
|
1827 /* 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
|
1828 || type == UNSHOW_BUFFER |
| 265 | 1829 || (mini && minibuf_level > 0)) |
| 1830 switch (type) | |
| 1831 { | |
| 1832 case GET_BUFFER_WINDOW: | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1833 if (EQ (w->buffer, obj) |
|
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1834 /* Don't find any minibuffer window |
|
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1835 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
|
1836 && (MINI_WINDOW_P (w) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1837 ? EQ (window, minibuf_window) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1838 : 1)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1839 { |
|
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1840 if (NILP (best_window)) |
|
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1841 best_window = window; |
|
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1842 else if (EQ (window, selected_window)) |
|
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1843 /* 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
|
1844 selected-window. */ |
|
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1845 best_window = window; |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1846 } |
| 265 | 1847 break; |
| 1848 | |
| 1849 case GET_LRU_WINDOW: | |
| 1850 /* t as arg means consider only full-width windows */ | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1851 if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w)) |
| 265 | 1852 break; |
| 1853 /* Ignore dedicated windows and minibuffers. */ | |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1854 if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) |
| 265 | 1855 break; |
| 485 | 1856 if (NILP (best_window) |
| 265 | 1857 || (XFASTINT (XWINDOW (best_window)->use_time) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1858 > XFASTINT (w->use_time))) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1859 best_window = window; |
| 265 | 1860 break; |
| 1861 | |
| 1862 case DELETE_OTHER_WINDOWS: | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1863 if (!EQ (window, obj)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1864 Fdelete_window (window); |
| 265 | 1865 break; |
| 1866 | |
| 1867 case DELETE_BUFFER_WINDOWS: | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1868 if (EQ (w->buffer, obj)) |
| 265 | 1869 { |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1870 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
|
1871 |
|
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1872 /* 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
|
1873 kill the frame. */ |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1874 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1875 && !NILP (w->dedicated) |
|
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1876 && other_visible_frames (f)) |
| 265 | 1877 { |
|
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1878 /* 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
|
1879 There might be one, the minibuffer! */ |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1880 while (CONSP (XCDR (windows)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1881 && EQ (XWINDOW (XCAR (windows))->frame, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1882 XWINDOW (XCAR (XCDR (windows)))->frame)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1883 windows = XCDR (windows); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1884 |
|
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1885 /* 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
|
1886 Fdelete_frame (w->frame, Qnil); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1887 } |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1888 else if (NILP (w->parent)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1889 { |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1890 /* 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
|
1891 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
|
1892 display there. */ |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1893 Lisp_Object buffer; |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1894 buffer = Fother_buffer (obj, Qnil, w->frame); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1895 Fset_window_buffer (window, buffer); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1896 if (EQ (window, selected_window)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1897 Fset_buffer (w->buffer); |
| 265 | 1898 } |
| 1899 else | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1900 Fdelete_window (window); |
| 265 | 1901 } |
| 1902 break; | |
| 1903 | |
| 1904 case GET_LARGEST_WINDOW: | |
| 1905 { | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1906 /* Ignore dedicated windows and minibuffers. */ |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1907 if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1908 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1909 |
|
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1910 if (NILP (best_window)) |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1911 best_window = window; |
|
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1912 else |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1913 { |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1914 struct window *b = XWINDOW (best_window); |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1915 if (XFASTINT (w->height) * XFASTINT (w->width) |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1916 > XFASTINT (b->height) * XFASTINT (b->width)) |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1917 best_window = window; |
|
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
1918 } |
| 265 | 1919 } |
| 1920 break; | |
| 1921 | |
| 1922 case UNSHOW_BUFFER: | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1923 if (EQ (w->buffer, obj)) |
| 265 | 1924 { |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1925 Lisp_Object buffer; |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1926 struct frame *f = XFRAME (w->frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1927 |
| 265 | 1928 /* 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
|
1929 buffer = Fother_buffer (obj, Qnil, w->frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1930 |
|
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1931 /* 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
|
1932 kill the frame. */ |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1933 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1934 && !NILP (w->dedicated) |
|
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1935 && other_visible_frames (f)) |
|
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1936 { |
|
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1937 /* Skip the other windows on this frame. |
|
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1938 There might be one, the minibuffer! */ |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1939 while (CONSP (XCDR (windows)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1940 && EQ (XWINDOW (XCAR (windows))->frame, |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1941 XWINDOW (XCAR (XCDR (windows)))->frame)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1942 windows = XCDR (windows); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1943 |
|
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1944 /* 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
|
1945 Fdelete_frame (w->frame, Qnil); |
|
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1946 } |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1947 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
|
1948 { |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1949 Lisp_Object window; |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1950 XSETWINDOW (window, w); |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1951 /* 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
|
1952 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
|
1953 Fdelete_window (window); |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1954 } |
|
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1955 else |
|
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1956 { |
|
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1957 /* 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
|
1958 w->dedicated = Qnil; |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1959 Fset_window_buffer (window, buffer); |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1960 if (EQ (window, selected_window)) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1961 Fset_buffer (w->buffer); |
|
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1962 } |
| 265 | 1963 } |
| 1964 break; | |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1965 |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1966 /* 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
|
1967 case CHECK_ALL_WINDOWS: |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1968 if (! NILP (w->buffer) |
|
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1969 && NILP (XBUFFER (w->buffer)->name)) |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1970 abort (); |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1971 break; |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
1972 |
|
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
1973 case WINDOW_LOOP_UNUSED: |
|
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
1974 break; |
| 265 | 1975 } |
| 1976 } | |
| 1977 | |
|
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1978 UNGCPRO; |
| 265 | 1979 return best_window; |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
1980 } |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1981 |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1982 /* 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
|
1983 |
| 25268 | 1984 void |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1985 check_all_windows () |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1986 { |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1987 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
|
1988 } |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1989 |
| 265 | 1990 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_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
|
1991 doc: /* Return the window least recently selected or used for display. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1992 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
|
1993 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
|
1994 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
|
1995 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
|
1996 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
|
1997 (frame) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1998 Lisp_Object frame; |
| 265 | 1999 { |
| 2000 register Lisp_Object w; | |
| 2001 /* First try for a window that is full-width */ | |
|
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2002 w = window_loop (GET_LRU_WINDOW, Qt, 0, frame); |
| 485 | 2003 if (!NILP (w) && !EQ (w, selected_window)) |
| 265 | 2004 return w; |
| 2005 /* If none of them, try the rest */ | |
|
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2006 return window_loop (GET_LRU_WINDOW, Qnil, 0, frame); |
| 265 | 2007 } |
| 2008 | |
| 2009 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_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
|
2010 doc: /* Return the largest window in area. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2011 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
|
2012 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
|
2013 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
|
2014 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
|
2015 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
|
2016 (frame) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2017 Lisp_Object frame; |
| 265 | 2018 { |
| 2019 return window_loop (GET_LARGEST_WINDOW, Qnil, 0, | |
| 769 | 2020 frame); |
| 265 | 2021 } |
| 2022 | |
| 2023 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
|
2024 doc: /* Return a window currently displaying BUFFER, or nil if none. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2025 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
|
2026 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
|
2027 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
|
2028 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
|
2029 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
|
2030 (buffer, frame) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2031 Lisp_Object buffer, frame; |
| 265 | 2032 { |
| 2033 buffer = Fget_buffer (buffer); | |
|
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2034 if (BUFFERP (buffer)) |
| 769 | 2035 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
| 265 | 2036 else |
| 2037 return Qnil; | |
| 2038 } | |
| 2039 | |
| 2040 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
|
2041 0, 1, "", |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2042 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
|
2043 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
|
2044 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
|
2045 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
|
2046 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
|
2047 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
|
2048 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
|
2049 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
|
2050 (window) |
| 265 | 2051 Lisp_Object window; |
| 2052 { | |
| 2053 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
|
2054 int startpos; |
|
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2055 int top, new_top; |
| 265 | 2056 |
| 485 | 2057 if (NILP (window)) |
| 265 | 2058 window = selected_window; |
| 2059 else | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2060 CHECK_LIVE_WINDOW (window); |
| 265 | 2061 w = XWINDOW (window); |
|
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2062 |
|
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2063 startpos = marker_position (w->start); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2064 top = XFASTINT (w->top) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
| 265 | 2065 |
|
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2066 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
|
2067 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
|
2068 |
|
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2069 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
| 265 | 2070 |
|
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2071 /* 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
|
2072 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
|
2073 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
|
2074 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
|
2075 not current, due to typeahead). */ |
|
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2076 new_top = XFASTINT (w->top) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
|
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2077 if (new_top != top |
|
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2078 && 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
|
2079 && 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
|
2080 { |
|
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2081 struct position pos; |
|
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2082 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
|
2083 |
|
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2084 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
|
2085 /* 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
|
2086 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
|
2087 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
|
2088 |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2089 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
|
2090 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
|
2091 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
|
2092 || 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
|
2093 : Qnil); |
|
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2094 /* 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
|
2095 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
|
2096 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
|
2097 |
|
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2098 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
|
2099 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2100 |
| 265 | 2101 return Qnil; |
| 2102 } | |
| 2103 | |
| 2104 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
|
2105 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
|
2106 doc: /* Delete all windows showing BUFFER. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2107 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
|
2108 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
|
2109 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
|
2110 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
|
2111 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
|
2112 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
|
2113 (buffer, frame) |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2114 Lisp_Object buffer, frame; |
| 265 | 2115 { |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2116 /* 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
|
2117 expects. */ |
|
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2118 if (NILP (frame)) |
|
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2119 frame = Qt; |
|
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2120 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
|
2121 frame = Qnil; |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2122 |
| 485 | 2123 if (!NILP (buffer)) |
| 265 | 2124 { |
| 2125 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
|
2126 CHECK_BUFFER (buffer); |
|
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2127 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
| 265 | 2128 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2129 |
| 265 | 2130 return Qnil; |
| 2131 } | |
| 2132 | |
| 2133 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
|
2134 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
|
2135 1, 1, "bReplace buffer in windows: ", |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2136 doc: /* Replace BUFFER with some other buffer in all windows showing it. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2137 (buffer) |
| 265 | 2138 Lisp_Object buffer; |
| 2139 { | |
| 485 | 2140 if (!NILP (buffer)) |
| 265 | 2141 { |
| 2142 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
|
2143 CHECK_BUFFER (buffer); |
| 265 | 2144 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
| 2145 } | |
| 2146 return Qnil; | |
| 2147 } | |
|
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2148 |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2149 /* 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
|
2150 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
|
2151 |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2152 void |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2153 replace_buffer_in_all_windows (buffer) |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2154 Lisp_Object buffer; |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2155 { |
|
14204
c0b44d3a8312
(replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2156 #ifdef MULTI_KBOARD |
|
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2157 Lisp_Object tail, frame; |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2158 |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2159 /* 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
|
2160 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
|
2161 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
|
2162 FOR_EACH_FRAME (tail, frame) |
|
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2163 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
|
2164 #else |
|
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2165 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
|
2166 #endif |
|
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2167 } |
| 265 | 2168 |
| 2169 /* 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
|
2170 |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2171 /* 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
|
2172 might crash Emacs. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2173 |
|
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2174 #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
|
2175 #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
|
2176 |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2177 /* 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
|
2178 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
|
2179 |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2180 static void |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2181 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
|
2182 { |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2183 /* 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
|
2184 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
|
2185 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
|
2186 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
|
2187 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
|
2188 } |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2189 |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2190 /* 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
|
2191 minimum allowable size. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2192 |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2193 void |
|
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2194 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
|
2195 FRAME_PTR frame; |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2196 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
|
2197 { |
|
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2198 /* 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
|
2199 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
|
2200 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
|
2201 int min_height |
|
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2202 = ((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
|
2203 ? MIN_SAFE_WINDOW_HEIGHT |
|
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2204 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2205 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2206 if (FRAME_TOP_MARGIN (frame) > 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2207 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
|
2208 |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2209 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
|
2210 *rows = min_height; |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2211 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
|
2212 *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
|
2213 } |
|
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2214 |
| 25254 | 2215 |
| 25268 | 2216 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
| 2217 check if W's width can be changed, otherwise check W's height. | |
| 2218 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
| 2219 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
| 2220 either. */ | |
| 2221 | |
| 2222 static int | |
| 2223 window_fixed_size_p (w, width_p, check_siblings_p) | |
| 2224 struct window *w; | |
| 2225 int width_p, check_siblings_p; | |
| 2226 { | |
| 2227 int fixed_p; | |
| 2228 struct window *c; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2229 |
| 25268 | 2230 if (!NILP (w->hchild)) |
| 2231 { | |
| 2232 c = XWINDOW (w->hchild); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2233 |
| 25268 | 2234 if (width_p) |
| 2235 { | |
| 2236 /* A horiz. combination is fixed-width if all of if its | |
| 2237 children are. */ | |
| 2238 while (c && window_fixed_size_p (c, width_p, 0)) | |
| 2239 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2240 fixed_p = c == NULL; | |
| 2241 } | |
| 2242 else | |
| 2243 { | |
| 2244 /* A horiz. combination is fixed-height if one of if its | |
| 2245 children is. */ | |
| 2246 while (c && !window_fixed_size_p (c, width_p, 0)) | |
| 2247 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2248 fixed_p = c != NULL; | |
| 2249 } | |
| 2250 } | |
| 2251 else if (!NILP (w->vchild)) | |
| 2252 { | |
| 2253 c = XWINDOW (w->vchild); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2254 |
| 25268 | 2255 if (width_p) |
| 2256 { | |
| 2257 /* A vert. combination is fixed-width if one of if its | |
| 2258 children is. */ | |
| 2259 while (c && !window_fixed_size_p (c, width_p, 0)) | |
| 2260 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2261 fixed_p = c != NULL; | |
| 2262 } | |
| 2263 else | |
| 2264 { | |
| 2265 /* A vert. combination is fixed-height if all of if its | |
| 2266 children are. */ | |
| 2267 while (c && window_fixed_size_p (c, width_p, 0)) | |
| 2268 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2269 fixed_p = c == NULL; | |
| 2270 } | |
| 2271 } | |
| 2272 else if (BUFFERP (w->buffer)) | |
| 2273 { | |
|
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2274 if (w->height_fixed_p && !width_p) |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2275 fixed_p = 1; |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2276 else |
| 25268 | 2277 { |
|
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2278 struct buffer *old = current_buffer; |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2279 Lisp_Object val; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2280 |
|
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2281 current_buffer = XBUFFER (w->buffer); |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2282 val = find_symbol_value (Qwindow_size_fixed); |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2283 current_buffer = old; |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2284 |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2285 fixed_p = 0; |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2286 if (!EQ (val, Qunbound)) |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2287 { |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2288 fixed_p = !NILP (val); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2289 |
|
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2290 if (fixed_p |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2291 && ((EQ (val, Qheight) && width_p) |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2292 || (EQ (val, Qwidth) && !width_p))) |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2293 fixed_p = 0; |
|
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2294 } |
| 25268 | 2295 } |
| 2296 | |
| 2297 /* Can't tell if this one is resizable without looking at | |
| 2298 siblings. If all siblings are fixed-size this one is too. */ | |
| 2299 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
| 2300 { | |
| 2301 Lisp_Object child; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2302 |
| 25268 | 2303 for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) |
| 2304 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
| 2305 break; | |
| 2306 | |
| 2307 if (NILP (child)) | |
| 2308 for (child = w->next; !NILP (child); child = XWINDOW (child)->next) | |
| 2309 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
| 2310 break; | |
| 2311 | |
| 2312 if (NILP (child)) | |
| 2313 fixed_p = 1; | |
| 2314 } | |
| 2315 } | |
| 2316 else | |
| 2317 fixed_p = 1; | |
| 2318 | |
| 2319 return fixed_p; | |
| 2320 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2321 |
| 25268 | 2322 |
| 2323 /* Return the minimum size of window W, not taking fixed-width windows | |
| 2324 into account. WIDTH_P non-zero means return the minimum width, | |
| 2325 otherwise return the minimum height. If W is a combination window, | |
| 2326 compute the minimum size from the minimum sizes of W's children. */ | |
| 2327 | |
| 2328 static int | |
| 2329 window_min_size_1 (w, width_p) | |
| 25254 | 2330 struct window *w; |
| 2331 int width_p; | |
| 2332 { | |
| 25268 | 2333 struct window *c; |
| 25254 | 2334 int size; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2335 |
| 25268 | 2336 if (!NILP (w->hchild)) |
| 2337 { | |
| 2338 c = XWINDOW (w->hchild); | |
| 2339 size = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2340 |
| 25268 | 2341 if (width_p) |
| 2342 { | |
| 2343 /* The min width of a horizontal combination is | |
| 2344 the sum of the min widths of its children. */ | |
| 2345 while (c) | |
| 2346 { | |
| 2347 size += window_min_size_1 (c, width_p); | |
| 2348 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2349 } | |
| 2350 } | |
| 2351 else | |
| 2352 { | |
| 2353 /* The min height a horizontal combination equals | |
| 2354 the maximum of all min height of its children. */ | |
| 2355 while (c) | |
| 2356 { | |
| 2357 int min_size = window_min_size_1 (c, width_p); | |
| 2358 size = max (min_size, size); | |
| 2359 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2360 } | |
| 2361 } | |
| 2362 } | |
| 2363 else if (!NILP (w->vchild)) | |
| 2364 { | |
| 2365 c = XWINDOW (w->vchild); | |
| 2366 size = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2367 |
| 25268 | 2368 if (width_p) |
| 2369 { | |
| 2370 /* The min width of a vertical combination is | |
| 2371 the maximum of the min widths of its children. */ | |
| 2372 while (c) | |
| 2373 { | |
| 2374 int min_size = window_min_size_1 (c, width_p); | |
| 2375 size = max (min_size, size); | |
| 2376 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2377 } | |
| 2378 } | |
| 2379 else | |
| 2380 { | |
| 2381 /* The min height of a vertical combination equals | |
| 2382 the sum of the min height of its children. */ | |
| 2383 while (c) | |
| 2384 { | |
| 2385 size += window_min_size_1 (c, width_p); | |
| 2386 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
| 2387 } | |
| 2388 } | |
| 2389 } | |
| 25254 | 2390 else |
| 2391 { | |
| 25268 | 2392 if (width_p) |
| 2393 size = window_min_width; | |
| 25254 | 2394 else |
| 25268 | 2395 { |
| 2396 if (MINI_WINDOW_P (w) | |
| 2397 || (!WINDOW_WANTS_MODELINE_P (w) | |
| 25546 | 2398 && !WINDOW_WANTS_HEADER_LINE_P (w))) |
| 25268 | 2399 size = 1; |
| 2400 else | |
| 2401 size = window_min_height; | |
| 2402 } | |
| 25254 | 2403 } |
| 2404 | |
| 2405 return size; | |
| 2406 } | |
| 2407 | |
| 2408 | |
| 25268 | 2409 /* Return the minimum size of window W, taking fixed-size windows into |
| 2410 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
|
2411 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
|
2412 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
|
2413 unless FIXED is null. */ |
| 25268 | 2414 |
| 2415 static int | |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2416 window_min_size (w, width_p, ignore_fixed_p, fixed) |
| 25268 | 2417 struct window *w; |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2418 int width_p, ignore_fixed_p, *fixed; |
| 25268 | 2419 { |
| 2420 int size, fixed_p; | |
| 2421 | |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2422 if (ignore_fixed_p) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2423 fixed_p = 0; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2424 else |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2425 fixed_p = window_fixed_size_p (w, width_p, 1); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2426 |
| 25268 | 2427 if (fixed) |
| 2428 *fixed = fixed_p; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2429 |
| 25268 | 2430 if (fixed_p) |
| 2431 size = width_p ? XFASTINT (w->width) : XFASTINT (w->height); | |
| 2432 else | |
| 2433 size = window_min_size_1 (w, width_p); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2434 |
| 25268 | 2435 return size; |
| 2436 } | |
| 2437 | |
| 2438 | |
| 2439 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set | |
| 2440 WINDOW's width. Resize WINDOW's children, if any, so that they | |
| 2441 keep their proportionate size relative to WINDOW. Propagate | |
| 2442 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
|
2443 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
|
2444 |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2445 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
|
2446 too small, even if they were too small before! */ |
| 25268 | 2447 |
| 2448 static void | |
| 2449 size_window (window, size, width_p, nodelete_p) | |
| 2450 Lisp_Object window; | |
| 2451 int size, width_p, nodelete_p; | |
| 2452 { | |
| 2453 struct window *w = XWINDOW (window); | |
| 2454 struct window *c; | |
| 2455 Lisp_Object child, *forward, *sideward; | |
| 2456 int old_size, min_size; | |
| 2457 | |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2458 if (nodelete_p == 2) |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2459 nodelete_p = 0; |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2460 |
| 25268 | 2461 check_min_window_sizes (); |
|
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2462 size = max (0, size); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2463 |
| 25268 | 2464 /* If the window has been "too small" at one point, |
| 2465 don't delete it for being "too small" in the future. | |
| 2466 Preserve it as long as that is at all possible. */ | |
| 2467 if (width_p) | |
| 2468 { | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2469 old_size = XINT (w->width); |
| 25268 | 2470 min_size = window_min_width; |
| 2471 } | |
| 2472 else | |
| 2473 { | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2474 old_size = XINT (w->height); |
| 25268 | 2475 min_size = window_min_height; |
| 2476 } | |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2477 |
|
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2478 if (old_size < min_size && nodelete_p != 2) |
| 25268 | 2479 w->too_small_ok = Qt; |
| 2480 | |
| 2481 /* 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
|
2482 if (nodelete_p != 1 && !NILP (w->parent)) |
| 25268 | 2483 { |
| 2484 if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok)) | |
| 2485 min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT; | |
| 2486 else | |
| 2487 min_size = width_p ? window_min_width : window_min_height; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2488 |
| 25268 | 2489 if (size < min_size) |
| 2490 { | |
| 2491 delete_window (window); | |
| 2492 return; | |
| 2493 } | |
| 2494 } | |
| 2495 | |
| 2496 /* Set redisplay hints. */ | |
|
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2497 w->last_modified = make_number (0); |
|
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2498 w->last_overlay_modified = make_number (0); |
| 25268 | 2499 windows_or_buffers_changed++; |
|
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2500 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
| 25268 | 2501 |
| 2502 if (width_p) | |
| 2503 { | |
| 2504 sideward = &w->vchild; | |
| 2505 forward = &w->hchild; | |
|
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2506 w->width = make_number (size); |
| 25268 | 2507 } |
| 2508 else | |
| 2509 { | |
| 2510 sideward = &w->hchild; | |
| 2511 forward = &w->vchild; | |
|
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2512 w->height = make_number (size); |
|
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
2513 w->orig_height = Qnil; |
| 25268 | 2514 } |
| 2515 | |
| 2516 if (!NILP (*sideward)) | |
| 2517 { | |
| 2518 for (child = *sideward; !NILP (child); child = c->next) | |
| 2519 { | |
| 2520 c = XWINDOW (child); | |
| 2521 if (width_p) | |
| 2522 c->left = w->left; | |
| 2523 else | |
| 2524 c->top = w->top; | |
| 2525 size_window (child, size, width_p, nodelete_p); | |
| 2526 } | |
| 2527 } | |
| 2528 else if (!NILP (*forward)) | |
| 2529 { | |
| 2530 int fixed_size, each, extra, n; | |
| 2531 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
|
2532 int last_pos, first_pos, nchildren, total; |
| 25268 | 2533 |
| 2534 /* Determine the fixed-size portion of the this window, and the | |
| 2535 number of child windows. */ | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2536 fixed_size = nchildren = nfixed = total = 0; |
| 25268 | 2537 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
| 2538 { | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2539 int child_size; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2540 |
| 25268 | 2541 c = XWINDOW (child); |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2542 child_size = width_p ? XINT (c->width) : XINT (c->height); |
|
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2543 total += child_size; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2544 |
| 25268 | 2545 if (window_fixed_size_p (c, width_p, 0)) |
| 2546 { | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2547 fixed_size += child_size; |
| 25268 | 2548 ++nfixed; |
| 2549 } | |
| 2550 } | |
| 2551 | |
| 2552 /* If the new size is smaller than fixed_size, or if there | |
| 2553 aren't any resizable windows, allow resizing fixed-size | |
| 2554 windows. */ | |
| 2555 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
| 2556 | |
| 2557 /* Compute how many lines/columns to add to each child. The | |
| 2558 value of extra takes care of rounding errors. */ | |
| 2559 n = resize_fixed_p ? nchildren : nchildren - nfixed; | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2560 each = (size - total) / n; |
|
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2561 extra = (size - total) - n * each; |
| 25268 | 2562 |
| 2563 /* Compute new children heights and edge positions. */ | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2564 first_pos = width_p ? XINT (w->left) : XINT (w->top); |
| 25268 | 2565 last_pos = first_pos; |
| 2566 for (child = *forward; !NILP (child); child = c->next) | |
| 2567 { | |
| 2568 int new_size, old_size; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2569 |
| 25268 | 2570 c = XWINDOW (child); |
| 2571 old_size = width_p ? XFASTINT (c->width) : XFASTINT (c->height); | |
| 2572 new_size = old_size; | |
| 2573 | |
| 2574 /* The top or left edge position of this child equals the | |
| 2575 bottom or right edge of its predecessor. */ | |
| 2576 if (width_p) | |
| 2577 c->left = make_number (last_pos); | |
| 2578 else | |
| 2579 c->top = make_number (last_pos); | |
| 2580 | |
| 2581 /* If this child can be resized, do it. */ | |
| 2582 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
| 2583 { | |
| 2584 new_size = old_size + each + extra; | |
| 2585 extra = 0; | |
| 2586 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2587 |
| 25268 | 2588 /* Set new height. Note that size_window also propagates |
| 2589 edge positions to children, so it's not a no-op if we | |
| 2590 didn't change the child's size. */ | |
| 2591 size_window (child, new_size, width_p, 1); | |
| 2592 | |
| 2593 /* Remember the bottom/right edge position of this child; it | |
| 2594 will be used to set the top/left edge of the next child. */ | |
| 2595 last_pos += new_size; | |
| 2596 } | |
| 2597 | |
| 2598 /* We should have covered the parent exactly with child windows. */ | |
| 2599 xassert (size == last_pos - first_pos); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2600 |
| 25268 | 2601 /* Now delete any children that became too small. */ |
| 2602 if (!nodelete_p) | |
| 2603 for (child = *forward; !NILP (child); child = c->next) | |
| 2604 { | |
| 2605 int child_size; | |
| 2606 c = XWINDOW (child); | |
|
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2607 child_size = width_p ? XINT (c->width) : XINT (c->height); |
|
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2608 size_window (child, child_size, width_p, 2); |
| 25268 | 2609 } |
| 2610 } | |
| 2611 } | |
| 2612 | |
| 2613 /* Set WINDOW's height to HEIGHT, and recursively change the height of | |
| 2614 WINDOW's children. NODELETE non-zero means don't delete windows | |
| 2615 that become too small in the process. (The caller should check | |
| 2616 later and do so if appropriate.) */ | |
| 265 | 2617 |
| 20351 | 2618 void |
| 265 | 2619 set_window_height (window, height, nodelete) |
| 2620 Lisp_Object window; | |
| 2621 int height; | |
| 2622 int nodelete; | |
| 2623 { | |
| 25268 | 2624 size_window (window, height, 0, nodelete); |
| 265 | 2625 } |
| 2626 | |
| 25268 | 2627 |
| 2628 /* Set WINDOW's width to WIDTH, and recursively change the width of | |
| 2629 WINDOW's children. NODELETE non-zero means don't delete windows | |
| 2630 that become too small in the process. (The caller should check | |
| 2631 later and do so if appropriate.) */ | |
| 265 | 2632 |
| 20351 | 2633 void |
| 265 | 2634 set_window_width (window, width, nodelete) |
| 2635 Lisp_Object window; | |
| 2636 int width; | |
| 2637 int nodelete; | |
| 2638 { | |
| 25268 | 2639 size_window (window, width, 1, nodelete); |
| 265 | 2640 } |
| 25268 | 2641 |
| 265 | 2642 |
| 362 | 2643 int window_select_count; |
| 265 | 2644 |
|
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2645 Lisp_Object |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2646 Fset_window_buffer_unwind (obuf) |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2647 Lisp_Object obuf; |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2648 { |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2649 Fset_buffer (obuf); |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2650 return Qnil; |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2651 } |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2652 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2653 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2654 /* 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
|
2655 means it's allowed to run hooks. See make_frame for a case where |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2656 it's not allowed. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2657 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2658 void |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2659 set_window_buffer (window, buffer, run_hooks_p) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2660 Lisp_Object window, buffer; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2661 int run_hooks_p; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2662 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2663 struct window *w = XWINDOW (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2664 struct buffer *b = XBUFFER (buffer); |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
2665 int count = SPECPDL_INDEX (); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2666 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2667 w->buffer = buffer; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2668 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2669 if (EQ (window, selected_window)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2670 b->last_selected_window = window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2671 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2672 /* Update time stamps of buffer display. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2673 if (INTEGERP (b->display_count)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2674 XSETINT (b->display_count, XINT (b->display_count) + 1); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2675 b->display_time = Fcurrent_time (); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2676 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2677 XSETFASTINT (w->window_end_pos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2678 XSETFASTINT (w->window_end_vpos, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2679 bzero (&w->last_cursor, sizeof w->last_cursor); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2680 w->window_end_valid = Qnil; |
|
36133
6eb00bee0989
(set_window_buffer): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36131
diff
changeset
|
2681 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
|
2682 w->vscroll = 0; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2683 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
|
2684 set_marker_restricted (w->start, |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2685 make_number (b->last_window_start), |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2686 buffer); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2687 w->start_at_line_beg = Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2688 w->force_start = Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2689 XSETFASTINT (w->last_modified, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2690 XSETFASTINT (w->last_overlay_modified, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2691 windows_or_buffers_changed++; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2692 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2693 /* 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
|
2694 If WINDOW is selected, switch permanently. |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2695 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
|
2696 if (EQ (window, selected_window)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2697 Fset_buffer (buffer); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2698 /* We can't check ! NILP (Vwindow_scroll_functions) here |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2699 because that might itself be a local variable. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2700 else if (window_initialized) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2701 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2702 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ()); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2703 Fset_buffer (buffer); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2704 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2705 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2706 /* Set left and right marginal area width from buffer. */ |
|
25591
d58d733a75d6
(Fset_window_margins): Make window the first argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25549
diff
changeset
|
2707 Fset_window_margins (window, b->left_margin_width, b->right_margin_width); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2708 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2709 if (run_hooks_p) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2710 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2711 if (! NILP (Vwindow_scroll_functions)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2712 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2713 Fmarker_position (w->start)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2714 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2715 if (! NILP (Vwindow_configuration_change_hook) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2716 && ! NILP (Vrun_hooks)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2717 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2718 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2719 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2720 unbind_to (count, Qnil); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2721 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2722 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2723 |
| 265 | 2724 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 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
|
2725 doc: /* Make WINDOW display BUFFER as its contents. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2726 BUFFER can be a buffer or buffer name. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2727 (window, buffer) |
| 265 | 2728 register Lisp_Object window, buffer; |
| 2729 { | |
| 2730 register Lisp_Object tem; | |
| 2731 register struct window *w = decode_window (window); | |
| 2732 | |
|
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
2733 XSETWINDOW (window, w); |
| 265 | 2734 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
|
2735 CHECK_BUFFER (buffer); |
| 265 | 2736 |
| 485 | 2737 if (NILP (XBUFFER (buffer)->name)) |
| 265 | 2738 error ("Attempt to display deleted buffer"); |
| 2739 | |
| 2740 tem = w->buffer; | |
| 485 | 2741 if (NILP (tem)) |
| 265 | 2742 error ("Window is deleted"); |
| 2743 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
| 2744 is first being set up. */ | |
| 2745 { | |
| 485 | 2746 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
|
2747 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
|
2748 SDATA (XBUFFER (tem)->name)); |
| 265 | 2749 |
| 2750 unshow_buffer (w); | |
| 2751 } | |
| 2752 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2753 set_window_buffer (window, buffer, 1); |
| 265 | 2754 return Qnil; |
| 2755 } | |
| 2756 | |
| 2757 DEFUN ("select-window", Fselect_window, Sselect_window, 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
|
2758 doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2759 If WINDOW is not already selected, also make WINDOW's buffer current. |
|
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2760 Also make WINDOW the frame's selected window. |
|
47567
1075de6f6ebd
(select_window_1): Don't select frame.
Richard M. Stallman <rms@gnu.org>
parents:
47234
diff
changeset
|
2761 |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2762 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
|
2763 selects the buffer of the selected window before each command. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2764 (window) |
| 265 | 2765 register Lisp_Object window; |
| 2766 { | |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2767 return select_window_1 (window, 1); |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2768 } |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2769 |
|
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2770 /* Note that selected_window can be nil |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2771 when this is called from Fset_window_configuration. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2772 |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2773 static Lisp_Object |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2774 select_window_1 (window, recordflag) |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2775 register Lisp_Object window; |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2776 int recordflag; |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2777 { |
| 265 | 2778 register struct window *w; |
|
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2779 register struct window *ow; |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2780 struct frame *sf; |
| 265 | 2781 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2782 CHECK_LIVE_WINDOW (window); |
| 265 | 2783 |
| 2784 w = XWINDOW (window); | |
|
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
2785 w->frozen_window_start_p = 0; |
| 265 | 2786 |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2787 XSETFASTINT (w->use_time, ++window_select_count); |
| 265 | 2788 if (EQ (window, selected_window)) |
| 2789 return window; | |
| 2790 | |
|
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2791 if (!NILP (selected_window)) |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2792 { |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2793 ow = XWINDOW (selected_window); |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2794 if (! NILP (ow->buffer)) |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2795 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
|
2796 BUF_PT (XBUFFER (ow->buffer)), |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2797 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
2798 } |
| 265 | 2799 |
| 2800 selected_window = window; | |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2801 sf = SELECTED_FRAME (); |
|
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2802 if (XFRAME (WINDOW_FRAME (w)) != sf) |
|
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2803 { |
|
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2804 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
|
2805 /* 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
|
2806 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
|
2807 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
|
2808 frame is active. */ |
|
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2809 Fselect_frame (WINDOW_FRAME (w), Qnil); |
|
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2810 } |
|
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
2811 else |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2812 sf->selected_window = window; |
| 265 | 2813 |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2814 if (recordflag) |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2815 record_buffer (w->buffer); |
| 265 | 2816 Fset_buffer (w->buffer); |
| 2817 | |
|
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
2818 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
|
2819 |
| 265 | 2820 /* Go to the point recorded in the window. |
| 2821 This is important when the buffer is in more | |
| 2822 than one window. It also matters when | |
| 2823 redisplay_window has altered point after scrolling, | |
| 2824 because it makes the change only in the window. */ | |
| 2825 { | |
| 2826 register int new_point = marker_position (w->pointm); | |
| 2827 if (new_point < BEGV) | |
| 2828 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
|
2829 else if (new_point > ZV) |
| 265 | 2830 SET_PT (ZV); |
| 2831 else | |
| 2832 SET_PT (new_point); | |
| 2833 } | |
| 2834 | |
| 2835 windows_or_buffers_changed++; | |
| 2836 return window; | |
| 2837 } | |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
2838 |
|
14175
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
2839 /* 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
|
2840 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
|
2841 then return WINDOW. |
|
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
2842 |
|
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
2843 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
|
2844 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
|
2845 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
|
2846 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
|
2847 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
|
2848 |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2849 static Lisp_Object |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2850 display_buffer_1 (window) |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2851 Lisp_Object window; |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2852 { |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2853 Lisp_Object frame = XWINDOW (window)->frame; |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2854 FRAME_PTR f = XFRAME (frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2855 |
|
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2856 FRAME_SAMPLE_VISIBILITY (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2857 |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2858 if (!EQ (frame, selected_frame)) |
|
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
2859 { |
|
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
2860 if (FRAME_ICONIFIED_P (f)) |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2861 Fmake_frame_visible (frame); |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2862 else if (FRAME_VISIBLE_P (f)) |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2863 Fraise_frame (frame); |
|
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
2864 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2865 |
|
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2866 return window; |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2867 } |
|
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
2868 |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2869 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_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
|
2870 doc: /* Returns non-nil if a buffer named BUFFER-NAME would be created specially. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2871 The value is actually t if the frame should be called with default frame |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2872 parameters, and a list of frame parameters if they were specified. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2873 See `special-display-buffer-names', and `special-display-regexps'. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2874 (buffer_name) |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2875 Lisp_Object buffer_name; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2876 { |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2877 Lisp_Object tem; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2878 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2879 CHECK_STRING (buffer_name); |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2880 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2881 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
|
2882 if (!NILP (tem)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2883 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2884 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2885 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
|
2886 if (!NILP (tem)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2887 return XCDR (tem); |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2888 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2889 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
|
2890 { |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2891 Lisp_Object car = XCAR (tem); |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2892 if (STRINGP (car) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2893 && 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
|
2894 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2895 else if (CONSP (car) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2896 && STRINGP (XCAR (car)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2897 && 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
|
2898 return XCDR (car); |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2899 } |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2900 return Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2901 } |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2902 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2903 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_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
|
2904 doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2905 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
|
2906 (buffer_name) |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2907 Lisp_Object buffer_name; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2908 { |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2909 Lisp_Object tem; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2910 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2911 CHECK_STRING (buffer_name); |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2912 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2913 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
|
2914 if (!NILP (tem)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2915 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2916 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2917 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
|
2918 if (!NILP (tem)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2919 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2920 |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2921 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
|
2922 { |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2923 Lisp_Object car = XCAR (tem); |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2924 if (STRINGP (car) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2925 && 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
|
2926 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2927 else if (CONSP (car) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2928 && STRINGP (XCAR (car)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2929 && 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
|
2930 return Qt; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2931 } |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2932 return Qnil; |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2933 } |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
2934 |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2935 /* 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
|
2936 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
|
2937 "BDisplay buffer: \nP", |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2938 doc: /* Make BUFFER appear in some window but don't select it. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2939 BUFFER can be a buffer or a buffer name. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2940 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
|
2941 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
|
2942 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
|
2943 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
|
2944 Returns the window displaying BUFFER. |
|
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
2945 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
|
2946 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
|
2947 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2948 The variables `special-display-buffer-names', `special-display-regexps', |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2949 `same-window-buffer-names', and `same-window-regexps' customize how certain |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2950 buffer names are handled. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2951 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2952 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
|
2953 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
|
2954 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
|
2955 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
|
2956 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
|
2957 (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
|
2958 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
|
2959 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
|
2960 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2961 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
|
2962 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
|
2963 displayed. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2964 (buffer, not_this_window, frame) |
|
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
2965 register Lisp_Object buffer, not_this_window, frame; |
| 265 | 2966 { |
|
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
2967 register Lisp_Object window, tem, swp; |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
2968 struct frame *f; |
|
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
2969 |
|
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
2970 swp = Qnil; |
| 265 | 2971 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
|
2972 CHECK_BUFFER (buffer); |
| 265 | 2973 |
| 485 | 2974 if (!NILP (Vdisplay_buffer_function)) |
| 265 | 2975 return call2 (Vdisplay_buffer_function, buffer, not_this_window); |
| 2976 | |
| 485 | 2977 if (NILP (not_this_window) |
| 265 | 2978 && 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
|
2979 return display_buffer_1 (selected_window); |
| 265 | 2980 |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
2981 /* 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
|
2982 in the selected window. */ |
|
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
2983 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
|
2984 { |
|
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
2985 swp = Fsame_window_p (XBUFFER (buffer)->name); |
|
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
2986 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
|
2987 { |
|
71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents:
10958
diff
changeset
|
2988 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
|
2989 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
|
2990 } |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
2991 } |
|
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
2992 |
|
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
2993 /* 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
|
2994 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
|
2995 Otherwise search only the current frame. */ |
|
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
2996 if (! NILP (frame)) |
|
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
2997 tem = frame; |
|
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
2998 else if (pop_up_frames |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
2999 || display_buffer_reuse_frames |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3000 || last_nonminibuf_frame == 0) |
|
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3001 XSETFASTINT (tem, 0); |
|
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3002 else |
|
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3003 XSETFRAME (tem, last_nonminibuf_frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3004 |
|
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3005 window = Fget_buffer_window (buffer, tem); |
| 485 | 3006 if (!NILP (window) |
| 3007 && (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
|
3008 return display_buffer_1 (window); |
| 265 | 3009 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3010 /* Certain buffer names get special handling. */ |
|
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3011 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
|
3012 { |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3013 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
|
3014 if (EQ (tem, Qt)) |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3015 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
|
3016 if (CONSP (tem)) |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3017 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
|
3018 } |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3019 |
| 769 | 3020 /* If there are no frames open that have more than a minibuffer, |
| 3021 we need to create a new frame. */ | |
| 3022 if (pop_up_frames || last_nonminibuf_frame == 0) | |
| 265 | 3023 { |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3024 window = Fframe_selected_window (call0 (Vpop_up_frame_function)); |
| 265 | 3025 Fset_window_buffer (window, buffer); |
|
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3026 return display_buffer_1 (window); |
| 265 | 3027 } |
| 3028 | |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3029 f = SELECTED_FRAME (); |
| 358 | 3030 if (pop_up_windows |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3031 || 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
|
3032 /* 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
|
3033 don't try to reuse its windows. */ |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3034 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (f))->dedicated)) |
| 358 | 3035 { |
|
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3036 Lisp_Object frames; |
|
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3037 |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3038 frames = Qnil; |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3039 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
|
3040 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
|
3041 /* Don't try to create a window if we would get an error. */ |
| 265 | 3042 if (split_height_threshold < window_min_height << 1) |
| 3043 split_height_threshold = window_min_height << 1; | |
| 3044 | |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3045 /* 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
|
3046 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
|
3047 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
|
3048 |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3049 /* 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
|
3050 try other frames. */ |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3051 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
|
3052 { |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3053 /* Try visible frames first. */ |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3054 window = Fget_largest_window (Qvisible); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3055 /* 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
|
3056 if (NILP (window)) |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3057 window = Fget_largest_window (make_number (0)); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3058 if (NILP (window)) |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3059 window = Fget_largest_window (Qt); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3060 } |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3061 else |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3062 window = Fget_largest_window (frames); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3063 |
|
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3064 /* 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
|
3065 split it. */ |
| 485 | 3066 if (!NILP (window) |
|
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3067 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
| 265 | 3068 && 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
|
3069 && WINDOW_FULL_WIDTH_P (XWINDOW (window))) |
| 265 | 3070 window = Fsplit_window (window, Qnil, Qnil); |
| 3071 else | |
| 3072 { | |
|
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3073 Lisp_Object upper, lower, other; |
|
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3074 |
| 769 | 3075 window = Fget_lru_window (frames); |
|
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3076 /* 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
|
3077 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
|
3078 if (!NILP (window) |
|
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3079 && ! 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
|
3080 && (EQ (window, selected_window) |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3081 || EQ (XWINDOW (window)->parent, Qnil)) |
| 265 | 3082 && window_height (window) >= window_min_height << 1) |
| 3083 window = Fsplit_window (window, Qnil, Qnil); | |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3084 /* 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
|
3085 |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3086 /* Try visible frames first. */ |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3087 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
|
3088 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
|
3089 if (NILP (window)) |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3090 window = Fget_largest_window (Qvisible); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3091 /* 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
|
3092 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
|
3093 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
|
3094 if (NILP (window)) |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3095 window = Fget_largest_window (make_number (0)); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3096 /* Try invisible frames. */ |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3097 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
|
3098 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
|
3099 if (NILP (window)) |
|
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3100 window = Fget_largest_window (Qt); |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3101 /* 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
|
3102 if (NILP (window)) |
|
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3103 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
|
3104 /* 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
|
3105 even out their heights. */ |
|
11750
b911d6f75664
(Fdisplay_buffer): Initialize other, upper, lower.
Richard M. Stallman <rms@gnu.org>
parents:
11731
diff
changeset
|
3106 other = upper = lower = Qnil; |
|
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3107 if (!NILP (XWINDOW (window)->prev)) |
|
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3108 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
|
3109 if (!NILP (XWINDOW (window)->next)) |
|
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3110 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
|
3111 if (!NILP (other) |
|
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
3112 && !NILP (Veven_window_heights) |
|
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3113 /* Check that OTHER and WINDOW are vertically arrayed. */ |
|
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
3114 && !EQ (XWINDOW (other)->top, XWINDOW (window)->top) |
|
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
3115 && (XFASTINT (XWINDOW (other)->height) |
|
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
3116 > XFASTINT (XWINDOW (window)->height))) |
|
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3117 { |
|
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
3118 int total = (XFASTINT (XWINDOW (other)->height) |
|
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
3119 + XFASTINT (XWINDOW (window)->height)); |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3120 enlarge_window (upper, |
|
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3121 total / 2 - XFASTINT (XWINDOW (upper)->height), |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3122 0, 0); |
|
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3123 } |
| 265 | 3124 } |
| 3125 } | |
| 3126 else | |
| 3127 window = Fget_lru_window (Qnil); | |
| 3128 | |
| 3129 Fset_window_buffer (window, buffer); | |
|
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3130 return display_buffer_1 (window); |
| 265 | 3131 } |
| 3132 | |
| 3133 void | |
| 3134 temp_output_buffer_show (buf) | |
| 3135 register Lisp_Object buf; | |
| 3136 { | |
| 3137 register struct buffer *old = current_buffer; | |
| 3138 register Lisp_Object window; | |
| 3139 register struct window *w; | |
| 3140 | |
|
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3141 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
|
3142 |
| 265 | 3143 Fset_buffer (buf); |
|
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3144 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
| 265 | 3145 BEGV = BEG; |
| 3146 ZV = Z; | |
| 3147 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
|
3148 #if 0 /* rms: there should be no reason for this. */ |
| 25375 | 3149 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
|
3150 #endif |
| 265 | 3151 set_buffer_internal (old); |
| 3152 | |
| 3153 if (!EQ (Vtemp_buffer_show_function, Qnil)) | |
| 3154 call1 (Vtemp_buffer_show_function, buf); | |
| 3155 else | |
| 3156 { | |
|
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3157 window = Fdisplay_buffer (buf, Qnil, Qnil); |
| 265 | 3158 |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3159 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
| 769 | 3160 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
| 265 | 3161 Vminibuf_scroll_window = window; |
| 3162 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
|
3163 XSETFASTINT (w->hscroll, 0); |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3164 XSETFASTINT (w->min_hscroll, 0); |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
3165 set_marker_restricted_both (w->start, buf, 1, 1); |
|
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
3166 set_marker_restricted_both (w->pointm, buf, 1, 1); |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3167 |
|
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3168 /* 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
|
3169 and its buffer current. */ |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3170 if (!NILP (Vrun_hooks)) |
|
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3171 { |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3172 Lisp_Object tem; |
|
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3173 tem = Fboundp (Qtemp_buffer_show_hook); |
|
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3174 if (!NILP (tem)) |
|
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3175 { |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3176 tem = Fsymbol_value (Qtemp_buffer_show_hook); |
|
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3177 if (!NILP (tem)) |
|
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3178 { |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
3179 int count = SPECPDL_INDEX (); |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3180 Lisp_Object prev_window; |
|
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3181 prev_window = selected_window; |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3182 |
|
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3183 /* Select the window that was chosen, for running the hook. */ |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3184 /* Both this Fselect_window and the select_window_1 |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3185 below will (may) incorrectly set-buffer to the buffer |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3186 displayed in the window. --stef */ |
|
23728
0d1a0ded9aa1
(temp_output_buffer_show): Around temp-buffer-show-hook,
Richard M. Stallman <rms@gnu.org>
parents:
23410
diff
changeset
|
3187 record_unwind_protect (Fselect_window, prev_window); |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3188 select_window_1 (window, 0); |
|
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3189 Fset_buffer (w->buffer); |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3190 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
|
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3191 select_window_1 (prev_window, 0); |
|
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3192 unbind_to (count, Qnil); |
|
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3193 } |
|
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3194 } |
|
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3195 } |
|
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3196 } |
| 265 | 3197 } |
| 3198 | |
| 21514 | 3199 static void |
| 265 | 3200 make_dummy_parent (window) |
| 3201 Lisp_Object window; | |
| 3202 { | |
|
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3203 Lisp_Object new; |
| 265 | 3204 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
|
3205 int i; |
|
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3206 |
|
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3207 o = XWINDOW (window); |
|
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3208 p = allocate_window (); |
|
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3209 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
|
3210 ((struct Lisp_Vector *) p)->contents[i] |
|
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3211 = ((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
|
3212 XSETWINDOW (new, p); |
|
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3213 |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3214 XSETFASTINT (p->sequence_number, ++sequence_number); |
| 265 | 3215 |
| 3216 /* Put new into window structure in place of window */ | |
| 3217 replace_window (window, new); | |
| 3218 | |
| 3219 o->next = Qnil; | |
| 3220 o->prev = Qnil; | |
| 3221 o->vchild = Qnil; | |
| 3222 o->hchild = Qnil; | |
| 3223 o->parent = new; | |
| 3224 | |
| 3225 p->start = Qnil; | |
| 3226 p->pointm = Qnil; | |
| 3227 p->buffer = Qnil; | |
| 3228 } | |
| 3229 | |
| 3230 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
|
3231 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
|
3232 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
|
3233 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
|
3234 and put SIZE columns in the first of the pair. In that case, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3235 SIZE includes that window's scroll bar, or the divider column to its right. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3236 (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
|
3237 Lisp_Object window, size, horflag; |
| 265 | 3238 { |
| 3239 register Lisp_Object new; | |
| 3240 register struct window *o, *p; | |
|
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3241 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
|
3242 register int size_int; |
| 265 | 3243 |
| 485 | 3244 if (NILP (window)) |
| 265 | 3245 window = selected_window; |
| 3246 else | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3247 CHECK_LIVE_WINDOW (window); |
| 265 | 3248 |
| 3249 o = XWINDOW (window); | |
|
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3250 fo = XFRAME (WINDOW_FRAME (o)); |
| 265 | 3251 |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3252 if (NILP (size)) |
| 265 | 3253 { |
| 485 | 3254 if (!NILP (horflag)) |
|
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3255 /* 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
|
3256 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
|
3257 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
|
3258 a dividing line, while the right-hand may not. */ |
|
e6c2ab650ebc
(Fsplit_window): For default size, round up for left window.
Karl Heuer <kwzh@gnu.org>
parents:
24997
diff
changeset
|
3259 size_int = (XFASTINT (o->width) + 1) >> 1; |
| 265 | 3260 else |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3261 size_int = XFASTINT (o->height) >> 1; |
| 265 | 3262 } |
| 3263 else | |
| 3264 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3265 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
|
3266 size_int = XINT (size); |
| 265 | 3267 } |
| 3268 | |
| 3269 if (MINI_WINDOW_P (o)) | |
| 3270 error ("Attempt to split minibuffer window"); | |
| 25268 | 3271 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
| 3272 error ("Attempt to split fixed-size window"); | |
| 265 | 3273 |
|
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3274 check_min_window_sizes (); |
| 265 | 3275 |
| 485 | 3276 if (NILP (horflag)) |
| 265 | 3277 { |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3278 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
|
3279 error ("Window height %d too small (after splitting)", size_int); |
|
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3280 if (size_int + window_min_height > XFASTINT (o->height)) |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3281 error ("Window height %d too small (after splitting)", |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3282 XFASTINT (o->height) - size_int); |
| 485 | 3283 if (NILP (o->parent) |
| 3284 || NILP (XWINDOW (o->parent)->vchild)) | |
| 265 | 3285 { |
| 3286 make_dummy_parent (window); | |
| 3287 new = o->parent; | |
| 3288 XWINDOW (new)->vchild = window; | |
| 3289 } | |
| 3290 } | |
| 3291 else | |
| 3292 { | |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3293 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
|
3294 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
|
3295 |
|
985270efc514
(Fsplit_window): Treat width just like height;
Richard M. Stallman <rms@gnu.org>
parents:
15712
diff
changeset
|
3296 if (size_int + window_min_width > XFASTINT (o->width)) |
|
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3297 error ("Window width %d too small (after splitting)", |
|
15902
985270efc514
(Fsplit_window): Treat width just like height;
Richard M. Stallman <rms@gnu.org>
parents:
15712
diff
changeset
|
3298 XFASTINT (o->width) - size_int); |
| 485 | 3299 if (NILP (o->parent) |
| 3300 || NILP (XWINDOW (o->parent)->hchild)) | |
| 265 | 3301 { |
| 3302 make_dummy_parent (window); | |
| 3303 new = o->parent; | |
| 3304 XWINDOW (new)->hchild = window; | |
| 3305 } | |
| 3306 } | |
| 3307 | |
| 3308 /* Now we know that window's parent is a vertical combination | |
| 3309 if we are dividing vertically, or a horizontal combination | |
| 3310 if we are making side-by-side windows */ | |
| 3311 | |
| 3312 windows_or_buffers_changed++; | |
|
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3313 FRAME_WINDOW_SIZES_CHANGED (fo) = 1; |
| 265 | 3314 new = make_window (); |
| 3315 p = XWINDOW (new); | |
| 3316 | |
| 769 | 3317 p->frame = o->frame; |
| 265 | 3318 p->next = o->next; |
| 485 | 3319 if (!NILP (p->next)) |
| 265 | 3320 XWINDOW (p->next)->prev = new; |
| 3321 p->prev = window; | |
| 3322 o->next = new; | |
| 3323 p->parent = o->parent; | |
| 3324 p->buffer = Qt; | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3325 p->window_end_valid = Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3326 bzero (&p->last_cursor, sizeof p->last_cursor); |
| 265 | 3327 |
| 769 | 3328 /* Apportion the available frame space among the two new windows */ |
| 265 | 3329 |
| 485 | 3330 if (!NILP (horflag)) |
| 265 | 3331 { |
| 3332 p->height = o->height; | |
| 3333 p->top = o->top; | |
|
15902
985270efc514
(Fsplit_window): Treat width just like height;
Richard M. Stallman <rms@gnu.org>
parents:
15712
diff
changeset
|
3334 XSETFASTINT (p->width, XFASTINT (o->width) - size_int); |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3335 XSETFASTINT (o->width, size_int); |
|
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3336 XSETFASTINT (p->left, XFASTINT (o->left) + size_int); |
| 265 | 3337 } |
| 3338 else | |
| 3339 { | |
| 3340 p->left = o->left; | |
| 3341 p->width = o->width; | |
|
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3342 XSETFASTINT (p->height, XFASTINT (o->height) - size_int); |
|
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3343 XSETFASTINT (o->height, size_int); |
|
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3344 XSETFASTINT (p->top, XFASTINT (o->top) + size_int); |
| 265 | 3345 } |
| 3346 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3347 /* Adjust glyph matrices. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3348 adjust_glyphs (fo); |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3349 Fset_window_buffer (new, o->buffer); |
| 265 | 3350 return new; |
| 3351 } | |
| 3352 | |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3353 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 3, "p", |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3354 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
|
3355 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
|
3356 Interactively, if an argument is not given, make the window one line bigger. |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3357 |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3358 Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3359 of the siblings above or to the left of the selected window. Only |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3360 siblings to the right or below are changed. */) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3361 (arg, side, preserve_before) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3362 register Lisp_Object arg, side, preserve_before; |
| 265 | 3363 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3364 CHECK_NUMBER (arg); |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3365 enlarge_window (selected_window, XINT (arg), !NILP (side), |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3366 !NILP (preserve_before)); |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3367 |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3368 if (! NILP (Vwindow_configuration_change_hook)) |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3369 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3370 |
| 265 | 3371 return Qnil; |
| 3372 } | |
| 3373 | |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3374 DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 3, "p", |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3375 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
|
3376 From program, optional second arg non-nil means shrink sideways arg columns. |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3377 Interactively, if an argument is not given, make the window one line smaller. |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3378 |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3379 Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3380 of the siblings above or to the left of the selected window. Only |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3381 siblings to the right or below are changed. */) |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3382 (arg, side, preserve_before) |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3383 register Lisp_Object arg, side, preserve_before; |
| 265 | 3384 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3385 CHECK_NUMBER (arg); |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3386 enlarge_window (selected_window, -XINT (arg), !NILP (side), |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3387 !NILP (preserve_before)); |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3388 |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3389 if (! NILP (Vwindow_configuration_change_hook)) |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3390 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3391 |
| 265 | 3392 return Qnil; |
| 3393 } | |
| 3394 | |
| 3395 int | |
| 3396 window_height (window) | |
| 3397 Lisp_Object window; | |
| 3398 { | |
| 3399 register struct window *p = XWINDOW (window); | |
| 3400 return XFASTINT (p->height); | |
| 3401 } | |
| 3402 | |
| 3403 int | |
| 3404 window_width (window) | |
| 3405 Lisp_Object window; | |
| 3406 { | |
| 3407 register struct window *p = XWINDOW (window); | |
| 3408 return XFASTINT (p->width); | |
| 3409 } | |
| 3410 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3411 |
| 265 | 3412 #define CURBEG(w) \ |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3413 *(widthflag ? &(XWINDOW (w)->left) : &(XWINDOW (w)->top)) |
| 265 | 3414 |
| 3415 #define CURSIZE(w) \ | |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3416 *(widthflag ? &(XWINDOW (w)->width) : &(XWINDOW (w)->height)) |
| 265 | 3417 |
| 25268 | 3418 |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3419 /* Enlarge WINDOW by DELTA. WIDTHFLAG non-zero means |
| 25268 | 3420 increase its width. Siblings of the selected window are resized to |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3421 fulfill the size request. If they become too small in the process, |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3422 they will be deleted. |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3423 |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3424 If PRESERVE_BEFORE is nonzero, that means don't alter |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3425 the siblings to the left or above WINDOW. */ |
| 265 | 3426 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3427 static void |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3428 enlarge_window (window, delta, widthflag, preserve_before) |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3429 Lisp_Object window; |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3430 int delta, widthflag, preserve_before; |
| 265 | 3431 { |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3432 Lisp_Object parent, next, prev; |
| 25268 | 3433 struct window *p; |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3434 Lisp_Object *sizep; |
|
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3435 int maximum; |
| 20351 | 3436 int (*sizefun) P_ ((Lisp_Object)) |
| 3437 = widthflag ? window_width : window_height; | |
| 25268 | 3438 void (*setsizefun) P_ ((Lisp_Object, int, int)) |
| 20351 | 3439 = (widthflag ? set_window_width : set_window_height); |
| 25268 | 3440 |
| 3441 /* Check values of window_min_width and window_min_height for | |
| 3442 validity. */ | |
|
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3443 check_min_window_sizes (); |
| 265 | 3444 |
| 25268 | 3445 /* Give up if this window cannot be resized. */ |
| 3446 if (window_fixed_size_p (XWINDOW (window), widthflag, 1)) | |
| 3447 error ("Window is not resizable"); | |
| 3448 | |
| 3449 /* Find the parent of the selected window. */ | |
| 265 | 3450 while (1) |
| 3451 { | |
| 3452 p = XWINDOW (window); | |
| 3453 parent = p->parent; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3454 |
| 485 | 3455 if (NILP (parent)) |
| 265 | 3456 { |
| 3457 if (widthflag) | |
| 3458 error ("No other window to side of this one"); | |
| 3459 break; | |
| 3460 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3461 |
| 25268 | 3462 if (widthflag |
| 3463 ? !NILP (XWINDOW (parent)->hchild) | |
| 485 | 3464 : !NILP (XWINDOW (parent)->vchild)) |
| 265 | 3465 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3466 |
| 265 | 3467 window = parent; |
| 3468 } | |
| 3469 | |
|
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3470 sizep = &CURSIZE (window); |
|
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3471 |
| 265 | 3472 { |
| 3473 register int maxdelta; | |
| 3474 | |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3475 /* 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
|
3476 |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3477 if (preserve_before) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3478 { |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3479 if (!NILP (parent)) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3480 { |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3481 maxdelta = (*sizefun) (parent) - XINT (*sizep); |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3482 /* Subtract size of siblings before, since we can't take that. */ |
|
42351
29b74fa42a55
* window.c (enlarge_window): In new preserve_before code, convert CURBEG from
Ken Raeburn <raeburn@raeburn.org>
parents:
42308
diff
changeset
|
3483 maxdelta -= XINT (CURBEG (window)) - XINT (CURBEG (parent)); |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3484 } |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3485 else |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3486 maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3487 - window_min_size (XWINDOW (p->next), |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3488 widthflag, 0, 0)) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3489 : (delta = 0)); |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3490 } |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3491 else |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3492 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3493 /* This is a main window followed by a minibuffer. */ |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3494 : !NILP (p->next) ? ((*sizefun) (p->next) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3495 - window_min_size (XWINDOW (p->next), |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3496 widthflag, 0, 0)) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3497 /* This is a minibuffer following a main window. */ |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3498 : !NILP (p->prev) ? ((*sizefun) (p->prev) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3499 - window_min_size (XWINDOW (p->prev), |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3500 widthflag, 0, 0)) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3501 /* This is a frame with only one window, a minibuffer-only |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3502 or a minibufferless frame. */ |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3503 : (delta = 0)); |
| 265 | 3504 |
| 3505 if (delta > maxdelta) | |
| 3506 /* This case traps trying to make the minibuffer | |
| 769 | 3507 the full frame, or make the only window aside from the |
| 3508 minibuffer the full frame. */ | |
| 265 | 3509 delta = maxdelta; |
|
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3510 } |
|
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3511 |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3512 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), widthflag, 0, 0)) |
|
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3513 { |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3514 delete_window (window); |
| 432 | 3515 return; |
|
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3516 } |
|
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3517 |
|
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3518 if (delta == 0) |
|
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3519 return; |
|
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3520 |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3521 /* 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
|
3522 maximum = 0; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3523 for (next = p->next; ! NILP (next); next = XWINDOW (next)->next) |
| 25254 | 3524 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3525 widthflag, 0, 0); |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3526 if (! preserve_before) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3527 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3528 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3529 widthflag, 0, 0); |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3530 |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3531 /* 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
|
3532 if (delta <= maximum) |
| 265 | 3533 { |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3534 Lisp_Object first_unaffected; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3535 Lisp_Object first_affected; |
| 25268 | 3536 int fixed_p; |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3537 |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3538 next = p->next; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3539 prev = p->prev; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3540 first_affected = window; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3541 /* 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
|
3542 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
|
3543 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
|
3544 while (delta != 0 |
|
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3545 && (!NILP (next) || (!preserve_before && !NILP (prev)))) |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3546 { |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3547 if (! NILP (next)) |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3548 { |
| 25254 | 3549 int this_one = ((*sizefun) (next) |
| 25268 | 3550 - window_min_size (XWINDOW (next), |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3551 widthflag, 0, &fixed_p)); |
| 25268 | 3552 if (!fixed_p) |
| 3553 { | |
| 3554 if (this_one > delta) | |
| 3555 this_one = delta; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3556 |
| 25268 | 3557 (*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
|
3558 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
| 25268 | 3559 |
| 3560 delta -= this_one; | |
| 3561 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3562 |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3563 next = XWINDOW (next)->next; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3564 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3565 |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3566 if (delta == 0) |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3567 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3568 |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3569 if (!preserve_before && ! NILP (prev)) |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3570 { |
| 25254 | 3571 int this_one = ((*sizefun) (prev) |
| 25268 | 3572 - window_min_size (XWINDOW (prev), |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3573 widthflag, 0, &fixed_p)); |
| 25268 | 3574 if (!fixed_p) |
| 3575 { | |
| 3576 if (this_one > delta) | |
| 3577 this_one = delta; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3578 |
| 25268 | 3579 first_affected = prev; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3580 |
| 25268 | 3581 (*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
|
3582 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
| 25268 | 3583 |
| 3584 delta -= this_one; | |
| 3585 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3586 |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3587 prev = XWINDOW (prev)->prev; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3588 } |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3589 } |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3590 |
| 25268 | 3591 xassert (delta == 0); |
| 3592 | |
|
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3593 /* 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
|
3594 based on the new sizes. */ |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3595 first_unaffected = next; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3596 prev = first_affected; |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3597 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
|
3598 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
|
3599 { |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3600 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
|
3601 /* 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
|
3602 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
|
3603 (*setsizefun) (next, (*sizefun) (next), 0); |
|
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3604 } |
| 265 | 3605 } |
| 3606 else | |
| 3607 { | |
| 3608 register int delta1; | |
| 3609 register int opht = (*sizefun) (parent); | |
| 3610 | |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3611 if (opht <= XINT (*sizep) + delta) |
|
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3612 { |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3613 /* 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
|
3614 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
|
3615 Lisp_Object start, tem, next; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3616 |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3617 start = XWINDOW (parent)->vchild; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3618 if (NILP (start)) |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3619 start = XWINDOW (parent)->hchild; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3620 |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3621 /* 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
|
3622 tem = XWINDOW (window)->next; |
|
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3623 while (! NILP (tem)) |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3624 { |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3625 next = XWINDOW (tem)->next; |
|
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3626 delete_window (tem); |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3627 tem = next; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3628 } |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3629 |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3630 /* 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
|
3631 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
|
3632 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
|
3633 tem = start; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3634 while (! EQ (tem, window)) |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3635 { |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3636 next = XWINDOW (tem)->next; |
|
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
3637 delete_window (tem); |
|
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3638 tem = next; |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3639 } |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3640 } |
| 265 | 3641 else |
| 25268 | 3642 { |
| 3643 /* Otherwise, make delta1 just right so that if we add | |
| 3644 delta1 lines to this window and to the parent, and then | |
| 3645 shrink the parent back to its original size, the new | |
| 3646 proportional size of this window will increase by delta. | |
| 3647 | |
| 3648 The function size_window will compute the new height h' | |
| 3649 of the window from delta1 as: | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3650 |
| 25268 | 3651 e = delta1/n |
| 3652 x = delta1 - delta1/n * n for the 1st resizable child | |
| 3653 h' = h + e + x | |
| 3654 | |
| 3655 where n is the number of children that can be resized. | |
| 3656 We can ignore x by choosing a delta1 that is a multiple of | |
| 3657 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
|
3658 |
| 25268 | 3659 h' = h + delta |
| 3660 | |
| 3661 So, delta1 must be | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3662 |
| 25268 | 3663 h + e = h + delta |
| 3664 delta1/n = delta | |
| 3665 delta1 = n * delta. | |
| 3666 | |
|
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3667 The number of children n equals the number of resizable |
| 25268 | 3668 children of this window + 1 because we know window itself |
| 3669 is resizable (otherwise we would have signalled an error. */ | |
| 3670 | |
| 3671 struct window *w = XWINDOW (window); | |
| 3672 Lisp_Object s; | |
| 3673 int n = 1; | |
| 3674 | |
| 3675 for (s = w->next; !NILP (s); s = XWINDOW (s)->next) | |
| 3676 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
| 3677 ++n; | |
| 3678 for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev) | |
| 3679 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
| 3680 ++n; | |
| 3681 | |
| 3682 delta1 = n * delta; | |
|
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3683 |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3684 /* 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
|
3685 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
|
3686 XSETINT (CURSIZE (parent), opht + delta1); |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3687 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3688 |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3689 /* 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
|
3690 shriking this window and siblings proportionately. |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3691 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
|
3692 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
|
3693 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
|
3694 (*setsizefun) (parent, opht, 0); |
|
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
3695 |
| 25268 | 3696 } |
| 265 | 3697 } |
| 3698 | |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3699 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
|
3700 XSETFASTINT (p->last_overlay_modified, 0); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3701 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3702 /* Adjust glyph matrices. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3703 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
| 265 | 3704 } |
| 25254 | 3705 |
| 265 | 3706 #undef CURBEG |
| 3707 #undef CURSIZE | |
| 3708 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3709 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3710 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3711 /*********************************************************************** |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3712 Resizing Mini-Windows |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3713 ***********************************************************************/ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3714 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3715 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
|
3716 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3717 enum save_restore_action |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3718 { |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3719 CHECK_ORIG_SIZES, |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3720 SAVE_ORIG_SIZES, |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3721 RESTORE_ORIG_SIZES |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3722 }; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3723 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3724 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
|
3725 enum save_restore_action)); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3726 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3727 /* 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
|
3728 from lowest windows first. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3729 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3730 static void |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3731 shrink_window_lowest_first (w, height) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3732 struct window *w; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3733 int height; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3734 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3735 struct window *c; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3736 Lisp_Object child; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3737 int old_height; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3738 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3739 xassert (!MINI_WINDOW_P (w)); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3740 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3741 /* Set redisplay hints. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3742 XSETFASTINT (w->last_modified, 0); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3743 XSETFASTINT (w->last_overlay_modified, 0); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3744 windows_or_buffers_changed++; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3745 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
|
3746 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3747 old_height = XFASTINT (w->height); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3748 XSETFASTINT (w->height, height); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3749 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3750 if (!NILP (w->hchild)) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3751 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3752 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
|
3753 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3754 c = XWINDOW (child); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3755 c->top = w->top; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3756 shrink_window_lowest_first (c, height); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3757 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3758 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3759 else if (!NILP (w->vchild)) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3760 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3761 Lisp_Object last_child; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3762 int delta = old_height - height; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3763 int last_top; |
|
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
3764 |
|
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
3765 last_child = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3766 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3767 /* 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
|
3768 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
|
3769 backwards. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3770 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
|
3771 last_child = child; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3772 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3773 /* 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
|
3774 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
|
3775 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3776 int this_one; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3777 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3778 c = XWINDOW (child); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3779 this_one = XFASTINT (c->height) - MIN_SAFE_WINDOW_HEIGHT; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3780 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3781 if (this_one > delta) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3782 this_one = delta; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3783 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3784 shrink_window_lowest_first (c, XFASTINT (c->height) - this_one); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3785 delta -= this_one; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3786 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3787 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3788 /* Compute new positions. */ |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3789 last_top = XINT (w->top); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3790 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
|
3791 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3792 c = XWINDOW (child); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3793 c->top = make_number (last_top); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3794 shrink_window_lowest_first (c, XFASTINT (c->height)); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3795 last_top += XFASTINT (c->height); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3796 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3797 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3798 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3799 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3800 |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3801 /* 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
|
3802 rooted at W. ACTION says what to do. |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3803 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3804 If ACTION is CHECK_ORIG_SIZES, check if orig_top and orig_height |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3805 members are valid for all windows in the window tree. Value is |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3806 non-zero if they are valid. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3807 |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3808 If ACTION is SAVE_ORIG_SIZES, save members top and height in |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3809 orig_top and orig_height for all windows in the tree. |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3810 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3811 If ACTION is RESTORE_ORIG_SIZES, restore top and height from |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3812 values stored in orig_top and orig_height for all windows. */ |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3813 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3814 static int |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3815 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
|
3816 struct window *w; |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3817 enum save_restore_action action; |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3818 { |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3819 int success_p = 1; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3820 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3821 while (w) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3822 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3823 if (!NILP (w->hchild)) |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3824 { |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3825 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3826 success_p = 0; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3827 } |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3828 else if (!NILP (w->vchild)) |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3829 { |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3830 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3831 success_p = 0; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3832 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3833 |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3834 switch (action) |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3835 { |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3836 case CHECK_ORIG_SIZES: |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3837 if (!INTEGERP (w->orig_top) || !INTEGERP (w->orig_height)) |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3838 return 0; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3839 break; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3840 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3841 case SAVE_ORIG_SIZES: |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3842 w->orig_top = w->top; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3843 w->orig_height = w->height; |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3844 XSETFASTINT (w->last_modified, 0); |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3845 XSETFASTINT (w->last_overlay_modified, 0); |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3846 break; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3847 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3848 case RESTORE_ORIG_SIZES: |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3849 xassert (INTEGERP (w->orig_top) && INTEGERP (w->orig_height)); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3850 w->top = w->orig_top; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3851 w->height = w->orig_height; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3852 w->orig_height = w->orig_top = Qnil; |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3853 XSETFASTINT (w->last_modified, 0); |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3854 XSETFASTINT (w->last_overlay_modified, 0); |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3855 break; |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3856 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3857 default: |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3858 abort (); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3859 } |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3860 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3861 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
|
3862 } |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3863 |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3864 return success_p; |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3865 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3866 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3867 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3868 /* 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
|
3869 without deleting other windows. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3870 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3871 void |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3872 grow_mini_window (w, delta) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3873 struct window *w; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3874 int delta; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3875 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3876 struct frame *f = XFRAME (w->frame); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3877 struct window *root; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3878 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3879 xassert (MINI_WINDOW_P (w)); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3880 xassert (delta >= 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3881 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3882 /* 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
|
3883 validity. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3884 check_min_window_sizes (); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3885 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3886 /* 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
|
3887 other windows. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3888 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3889 if (delta) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3890 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3891 int min_height = window_min_size (root, 0, 0, 0); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3892 if (XFASTINT (root->height) - delta < min_height) |
|
40619
4e8c66bd2abb
(grow_mini_window): Fix typo in comment.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40543
diff
changeset
|
3893 /* 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
|
3894 min_height. */ |
|
9461cfa8d18d
(grow_mini_window): Handle case that the root
Gerd Moellmann <gerd@gnu.org>
parents:
40459
diff
changeset
|
3895 delta = max (0, XFASTINT (root->height) - min_height); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3896 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3897 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3898 if (delta) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3899 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3900 /* 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
|
3901 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
|
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3902 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
|
3903 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3904 /* Shrink other windows. */ |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3905 shrink_window_lowest_first (root, XFASTINT (root->height) - delta); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3906 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3907 /* Grow the mini-window. */ |
|
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3908 w->top = make_number (XFASTINT (root->top) + XFASTINT (root->height)); |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3909 w->height = make_number (XFASTINT (w->height) + delta); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3910 XSETFASTINT (w->last_modified, 0); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3911 XSETFASTINT (w->last_overlay_modified, 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3912 |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3913 adjust_glyphs (f); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3914 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3915 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3916 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3917 |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3918 /* 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
|
3919 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
|
3920 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
|
3921 line. */ |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3922 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3923 void |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3924 shrink_mini_window (w) |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3925 struct window *w; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3926 { |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3927 struct frame *f = XFRAME (w->frame); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3928 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
|
3929 |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3930 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
|
3931 { |
|
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
3932 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
|
3933 adjust_glyphs (f); |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3934 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3935 windows_or_buffers_changed = 1; |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3936 } |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3937 else if (XFASTINT (w->height) > 1) |
|
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3938 { |
|
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
3939 /* 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
|
3940 among the other windows. */ |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3941 Lisp_Object window; |
|
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3942 XSETWINDOW (window, w); |
|
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3943 enlarge_window (window, 1 - XFASTINT (w->height), 0, 0); |
|
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3944 } |
|
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3945 } |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3946 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3947 |
|
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3948 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3949 /* 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
|
3950 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
|
3951 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
|
3952 the frame are cleared. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3953 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3954 void |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3955 mark_window_cursors_off (w) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3956 struct window *w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3957 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3958 while (w) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3959 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3960 if (!NILP (w->hchild)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3961 mark_window_cursors_off (XWINDOW (w->hchild)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3962 else if (!NILP (w->vchild)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3963 mark_window_cursors_off (XWINDOW (w->vchild)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3964 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3965 w->phys_cursor_on_p = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3966 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3967 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3968 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3969 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3970 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3971 |
|
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3972 /* Return number of lines of text (not counting mode lines) in W. */ |
| 265 | 3973 |
| 3974 int | |
| 3975 window_internal_height (w) | |
| 3976 struct window *w; | |
| 3977 { | |
| 3978 int ht = XFASTINT (w->height); | |
| 3979 | |
|
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3980 if (!MINI_WINDOW_P (w)) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3981 { |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3982 if (!NILP (w->parent) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3983 || !NILP (w->vchild) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3984 || !NILP (w->hchild) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3985 || !NILP (w->next) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3986 || !NILP (w->prev) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3987 || WINDOW_WANTS_MODELINE_P (w)) |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3988 --ht; |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3989 |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3990 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
|
3991 --ht; |
|
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
3992 } |
| 265 | 3993 |
| 3994 return ht; | |
| 3995 } | |
| 3996 | |
|
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
3997 |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
3998 /* 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
|
3999 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
|
4000 separating W from the sibling to its right. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4001 |
|
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4002 int |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4003 window_internal_width (w) |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4004 struct window *w; |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4005 { |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4006 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4007 int width = XINT (w->width); |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4008 |
|
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1931
diff
changeset
|
4009 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4010 /* Scroll bars occupy a few columns. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4011 width -= FRAME_SCROLL_BAR_COLS (f); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4012 else if (!WINDOW_RIGHTMOST_P (w) && !WINDOW_FULL_WIDTH_P (w)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4013 /* The column of `|' characters separating side-by-side windows |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4014 occupies one column only. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4015 width -= 1; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4016 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4017 /* On window-systems, areas to the left and right of the window |
| 41127 | 4018 are used as fringes. */ |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4019 if (FRAME_WINDOW_P (f)) |
| 41127 | 4020 width -= FRAME_FRINGE_COLS (f); |
|
16297
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4021 |
|
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4022 return width; |
|
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4023 } |
|
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4024 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4025 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4026 /************************************************************************ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4027 Window Scrolling |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4028 ***********************************************************************/ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4029 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4030 /* 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
|
4031 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
|
4032 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
|
4033 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
|
4034 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
|
4035 respectively. */ |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4036 |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4037 static void |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4038 window_scroll (window, n, whole, noerror) |
| 265 | 4039 Lisp_Object window; |
| 4040 int n; | |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4041 int whole; |
| 522 | 4042 int noerror; |
| 265 | 4043 { |
|
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4044 immediate_quit = 1; |
|
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4045 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4046 /* 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
|
4047 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
|
4048 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4049 window_scroll_pixel_based (window, n, whole, noerror); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4050 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4051 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
|
4052 |
|
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4053 immediate_quit = 0; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4054 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4055 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4056 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4057 /* 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
|
4058 heights. See the comment of window_scroll for parameter |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4059 descriptions. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4060 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4061 static void |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4062 window_scroll_pixel_based (window, n, whole, noerror) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4063 Lisp_Object window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4064 int n; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4065 int whole; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4066 int noerror; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4067 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4068 struct it it; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4069 struct window *w = XWINDOW (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4070 struct text_pos start; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4071 Lisp_Object tem; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4072 int this_scroll_margin; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4073 int preserve_y; |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4074 /* 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
|
4075 int vscrolled = 0; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4076 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4077 SET_TEXT_POS_FROM_MARKER (start, w->start); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4078 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4079 /* 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
|
4080 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
|
4081 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
|
4082 the partially visible one would recenter. */ |
|
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4083 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
|
4084 if (NILP (tem)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4085 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4086 /* 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
|
4087 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
|
4088 results for variable height lines. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4089 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
|
4090 it.current_y = it.last_visible_y; |
|
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
4091 move_it_vertically (&it, - window_box_height (w) / 2); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4092 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4093 /* 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
|
4094 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
|
4095 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
|
4096 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
|
4097 start of the line containing PT in this case. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4098 if (it.current_y <= 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4099 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4100 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
|
4101 move_it_vertically (&it, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4102 it.current_y = 0; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4103 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4104 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4105 start = it.current.pos; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4106 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4107 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4108 /* If scroll_preserve_screen_position is non-zero, we try to set |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4109 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
|
4110 if (!NILP (Vscroll_preserve_screen_position)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4111 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4112 start_display (&it, w, start); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4113 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
|
4114 preserve_y = it.current_y; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4115 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4116 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4117 preserve_y = -1; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4118 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4119 /* 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
|
4120 backward. The result is the new window start. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4121 start_display (&it, w, start); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4122 if (whole) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4123 { |
|
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
4124 int screen_full = (window_box_height (w) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4125 - next_screen_context_lines * CANON_Y_UNIT (it.f)); |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4126 int dy = n * screen_full; |
|
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4127 |
|
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4128 /* 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
|
4129 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
|
4130 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
|
4131 if (dy <= 0) |
|
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4132 move_it_vertically_backward (&it, -dy); |
|
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4133 else if (dy > 0) |
|
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4134 move_it_to (&it, ZV, -1, it.current_y + dy, -1, |
|
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4135 MOVE_TO_POS | MOVE_TO_Y); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4136 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4137 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4138 move_it_by_lines (&it, n, 1); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4139 |
|
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4140 /* 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
|
4141 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
|
4142 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
|
4143 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
|
4144 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4145 { |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4146 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
|
4147 { |
|
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4148 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
|
4149 && (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
|
4150 >= it.last_visible_y)) |
|
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4151 { |
|
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4152 /* 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
|
4153 visible. */ |
|
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4154 w->vscroll = (it.last_visible_y |
|
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4155 - 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
|
4156 adjust_glyphs (it.f); |
|
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4157 } |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4158 else if (noerror) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4159 return; |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4160 else |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4161 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
|
4162 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4163 else |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4164 { |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4165 if (w->vscroll != 0) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4166 /* 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
|
4167 visible. */ |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4168 w->vscroll = 0; |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4169 else if (noerror) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4170 return; |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4171 else |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4172 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
|
4173 } |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4174 |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4175 /* 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
|
4176 |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4177 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
|
4178 |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4179 /* 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
|
4180 vscrolled = 1; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4181 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4182 |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4183 if (! vscrolled) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4184 { |
|
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4185 int pos = IT_CHARPOS (it); |
|
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4186 int bytepos; |
|
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4187 |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4188 /* If in the middle of a multi-glyph character move forward to |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4189 the next character. */ |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4190 if (in_display_vector_p (&it)) |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4191 { |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4192 ++pos; |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4193 move_it_to (&it, pos, -1, -1, -1, MOVE_TO_POS); |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4194 } |
|
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4195 |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4196 /* 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
|
4197 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
|
4198 w->buffer); |
|
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4199 bytepos = XMARKER (w->start)->bytepos; |
|
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4200 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
|
4201 ? Qt : Qnil); |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4202 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
|
4203 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
|
4204 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
|
4205 /* 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
|
4206 window-scroll-functions. */ |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4207 w->force_start = Qt; |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4208 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4209 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4210 it.current_y = it.vpos = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4211 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4212 /* Preserve the screen position if we must. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4213 if (preserve_y >= 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4214 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4215 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4216 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4217 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4218 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4219 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4220 /* Move PT out of scroll margins. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4221 this_scroll_margin = max (0, scroll_margin); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4222 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4223 this_scroll_margin *= CANON_Y_UNIT (it.f); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4224 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4225 if (n > 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4226 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4227 /* We moved the window start towards ZV, so PT may be now |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4228 in the scroll margin at the top. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4229 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
|
4230 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
|
4231 { |
|
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4232 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
|
4233 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
|
4234 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
|
4235 break; |
|
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4236 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4237 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4238 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4239 else if (n < 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4240 { |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4241 int charpos, bytepos; |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4242 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4243 /* We moved the window start towards BEGV, so PT may be now |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4244 in the scroll margin at the bottom. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4245 move_it_to (&it, PT, -1, |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4246 it.last_visible_y - this_scroll_margin - 1, -1, |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4247 MOVE_TO_POS | MOVE_TO_Y); |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4248 |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4249 /* Save our position, in case it's correct. */ |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4250 charpos = IT_CHARPOS (it); |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4251 bytepos = IT_BYTEPOS (it); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4252 |
|
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4253 /* See if point is on a partially visible line at the end. */ |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4254 move_it_by_lines (&it, 1, 1); |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4255 if (it.current_y > it.last_visible_y) |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4256 /* 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
|
4257 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
|
4258 { |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4259 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
|
4260 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
|
4261 } |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4262 else |
|
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4263 /* 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
|
4264 SET_PT_BOTH (charpos, bytepos); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4265 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4266 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4267 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4268 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4269 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4270 /* 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
|
4271 See the comment of window_scroll for parameter descriptions. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4272 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4273 static void |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4274 window_scroll_line_based (window, n, whole, noerror) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4275 Lisp_Object window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4276 int n; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4277 int whole; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4278 int noerror; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4279 { |
| 265 | 4280 register struct window *w = XWINDOW (window); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4281 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
|
4282 register int pos, pos_byte; |
| 265 | 4283 register int ht = window_internal_height (w); |
| 4284 register Lisp_Object tem; | |
| 4285 int lose; | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4286 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
|
4287 int startpos; |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4288 struct position posit; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4289 int original_vpos; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4290 |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4291 /* 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
|
4292 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
|
4293 if (whole) |
|
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4294 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
|
4295 |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4296 startpos = marker_position (w->start); |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4297 |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4298 posit = *compute_motion (startpos, 0, 0, 0, |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4299 PT, ht, 0, |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4300 window_internal_width (w), XINT (w->hscroll), |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4301 0, w); |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4302 original_vpos = posit.vpos; |
|
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
4303 |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4304 XSETFASTINT (tem, PT); |
|
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
4305 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
| 265 | 4306 |
| 485 | 4307 if (NILP (tem)) |
| 265 | 4308 { |
|
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
4309 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
|
4310 startpos = PT; |
| 265 | 4311 } |
|
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
|
4312 |
|
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
|
4313 SET_PT (startpos); |
| 7347 | 4314 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
|
4315 Fvertical_motion (make_number (n), window); |
| 7347 | 4316 pos = PT; |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4317 pos_byte = PT_BYTE; |
| 265 | 4318 bolp = Fbolp (); |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4319 SET_PT_BOTH (opoint, opoint_byte); |
| 265 | 4320 |
| 4321 if (lose) | |
| 522 | 4322 { |
| 4323 if (noerror) | |
| 4324 return; | |
| 4325 else | |
| 4326 Fsignal (Qbeginning_of_buffer, Qnil); | |
| 4327 } | |
| 265 | 4328 |
| 4329 if (pos < ZV) | |
| 4330 { | |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4331 int this_scroll_margin = scroll_margin; |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4332 |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4333 /* 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
|
4334 if (this_scroll_margin < 0) |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4335 this_scroll_margin = 0; |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4336 |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4337 if (XINT (w->height) < 4 * scroll_margin) |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4338 this_scroll_margin = XINT (w->height) / 4; |
|
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4339 |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4340 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
| 265 | 4341 w->start_at_line_beg = bolp; |
| 4342 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
|
4343 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
|
4344 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
|
4345 /* 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
|
4346 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
|
4347 w->force_start = Qt; |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4348 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4349 if (whole && !NILP (Vscroll_preserve_screen_position)) |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4350 { |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4351 SET_PT_BOTH (pos, pos_byte); |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4352 Fvertical_motion (make_number (original_vpos), window); |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4353 } |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4354 /* 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
|
4355 that it is outside the scroll margin. */ |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4356 else if (n > 0) |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4357 { |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4358 int top_margin; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4359 |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4360 if (this_scroll_margin > 0) |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4361 { |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4362 SET_PT_BOTH (pos, pos_byte); |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4363 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
|
4364 top_margin = PT; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4365 } |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4366 else |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4367 top_margin = pos; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4368 |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4369 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
|
4370 SET_PT_BOTH (opoint, opoint_byte); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4371 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
|
4372 { |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4373 SET_PT_BOTH (pos, pos_byte); |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4374 Fvertical_motion (make_number (original_vpos), window); |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4375 } |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4376 else |
|
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
4377 SET_PT (top_margin); |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4378 } |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4379 else if (n < 0) |
| 265 | 4380 { |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4381 int bottom_margin; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4382 |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4383 /* 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
|
4384 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
|
4385 SET_PT_BOTH (pos, pos_byte); |
|
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4386 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
|
4387 if (XFASTINT (tem) == ht - this_scroll_margin) |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4388 bottom_margin = PT; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4389 else |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4390 bottom_margin = PT + 1; |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4391 |
|
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4392 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
|
4393 SET_PT_BOTH (opoint, opoint_byte); |
| 265 | 4394 else |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4395 { |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4396 if (!NILP (Vscroll_preserve_screen_position)) |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4397 { |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4398 SET_PT_BOTH (pos, pos_byte); |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4399 Fvertical_motion (make_number (original_vpos), window); |
|
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4400 } |
|
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4401 else |
|
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4402 Fvertical_motion (make_number (-1), window); |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4403 } |
| 265 | 4404 } |
| 4405 } | |
| 4406 else | |
| 522 | 4407 { |
| 4408 if (noerror) | |
| 4409 return; | |
| 4410 else | |
| 4411 Fsignal (Qend_of_buffer, Qnil); | |
| 4412 } | |
| 265 | 4413 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4414 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4415 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4416 /* 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
|
4417 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
|
4418 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
|
4419 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
|
4420 up. This is the guts of Fscroll_up and Fscroll_down. */ |
| 265 | 4421 |
| 4422 static void | |
| 4423 scroll_command (n, direction) | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4424 Lisp_Object n; |
| 265 | 4425 int direction; |
| 4426 { | |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
4427 int count = SPECPDL_INDEX (); |
| 265 | 4428 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4429 xassert (abs (direction) == 1); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4430 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4431 /* 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
|
4432 the moment. But don't screw up if window_scroll gets an error. */ |
| 265 | 4433 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
| 548 | 4434 { |
| 4435 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
| 4436 Fset_buffer (XWINDOW (selected_window)->buffer); | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4437 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4438 /* Make redisplay consider other windows than just selected_window. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4439 ++windows_or_buffers_changed; |
| 548 | 4440 } |
| 265 | 4441 |
| 485 | 4442 if (NILP (n)) |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4443 window_scroll (selected_window, direction, 1, 0); |
| 265 | 4444 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
|
4445 window_scroll (selected_window, -direction, 1, 0); |
| 265 | 4446 else |
| 4447 { | |
| 4448 n = Fprefix_numeric_value (n); | |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4449 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
| 265 | 4450 } |
| 548 | 4451 |
| 4452 unbind_to (count, Qnil); | |
| 265 | 4453 } |
| 4454 | |
| 4455 DEFUN ("scroll-up", Fscroll_up, Sscroll_up, 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
|
4456 doc: /* Scroll text of current 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
|
4457 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
|
4458 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
|
4459 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
|
4460 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
|
4461 (arg) |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4462 Lisp_Object arg; |
| 265 | 4463 { |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4464 scroll_command (arg, 1); |
| 265 | 4465 return Qnil; |
| 4466 } | |
| 4467 | |
| 4468 DEFUN ("scroll-down", Fscroll_down, Sscroll_down, 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
|
4469 doc: /* Scroll text of current window down 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
|
4470 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
|
4471 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
|
4472 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
|
4473 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
|
4474 (arg) |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4475 Lisp_Object arg; |
| 265 | 4476 { |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4477 scroll_command (arg, -1); |
| 265 | 4478 return Qnil; |
| 4479 } | |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4480 |
|
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4481 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
|
4482 doc: /* Return the other window for \"other window scroll\" commands. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4483 If in the minibuffer, `minibuffer-scroll-window' if non-nil |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4484 specifies the window. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4485 If `other-window-scroll-buffer' is non-nil, a window |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4486 showing that buffer is used. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4487 () |
| 265 | 4488 { |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4489 Lisp_Object window; |
| 265 | 4490 |
| 4491 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
| 485 | 4492 && !NILP (Vminibuf_scroll_window)) |
| 265 | 4493 window = Vminibuf_scroll_window; |
| 4494 /* If buffer is specified, scroll that buffer. */ | |
| 485 | 4495 else if (!NILP (Vother_window_scroll_buffer)) |
| 265 | 4496 { |
| 4497 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
| 485 | 4498 if (NILP (window)) |
|
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
4499 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
| 265 | 4500 } |
| 4501 else | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4502 { |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4503 /* 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
|
4504 frame. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4505 window = Fnext_window (selected_window, Qnil, Qnil); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4506 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4507 if (EQ (window, selected_window)) |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4508 /* 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
|
4509 visible frame. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4510 do |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4511 window = Fnext_window (window, Qnil, Qt); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4512 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
|
4513 && ! EQ (window, selected_window)); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4514 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4515 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
4516 CHECK_LIVE_WINDOW (window); |
| 265 | 4517 |
| 4518 if (EQ (window, selected_window)) | |
| 4519 error ("There is no other window"); | |
| 4520 | |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4521 return window; |
|
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4522 } |
|
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4523 |
|
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4524 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
|
4525 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
|
4526 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
|
4527 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
|
4528 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
|
4529 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
|
4530 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
|
4531 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4532 If in the minibuffer, `minibuffer-scroll-window' if non-nil |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4533 specifies the window to scroll. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4534 If `other-window-scroll-buffer' is non-nil, scroll the window |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4535 showing that buffer, popping the buffer up if necessary. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4536 (arg) |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4537 Lisp_Object arg; |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4538 { |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4539 Lisp_Object window; |
|
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4540 struct window *w; |
|
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
4541 int count = SPECPDL_INDEX (); |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4542 |
|
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4543 window = Fother_window_for_scrolling (); |
| 265 | 4544 w = XWINDOW (window); |
| 4545 | |
| 4546 /* Don't screw up if window_scroll gets an error. */ | |
| 4547 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
|
4548 ++windows_or_buffers_changed; |
| 265 | 4549 |
| 4550 Fset_buffer (w->buffer); | |
| 4551 SET_PT (marker_position (w->pointm)); | |
| 4552 | |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4553 if (NILP (arg)) |
|
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4554 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
|
4555 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
|
4556 window_scroll (window, -1, 1, 1); |
| 265 | 4557 else |
| 4558 { | |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4559 if (CONSP (arg)) |
|
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4560 arg = Fcar (arg); |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
4561 CHECK_NUMBER (arg); |
|
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4562 window_scroll (window, XINT (arg), 0, 1); |
| 265 | 4563 } |
| 4564 | |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4565 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
|
4566 unbind_to (count, Qnil); |
| 265 | 4567 |
| 4568 return Qnil; | |
| 4569 } | |
| 4570 | |
|
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
4571 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 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
|
4572 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
|
4573 Default for ARG is window width minus 2. |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4574 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
|
4575 effect after the change. |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4576 If `automatic-hscrolling' is non-nil, the argument ARG modifies |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4577 a lower bound for automatic scrolling, i.e. automatic scrolling |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4578 will not scroll a window to a column less than the value returned |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4579 by this function. */) |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4580 (arg) |
| 265 | 4581 register Lisp_Object arg; |
| 4582 { | |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4583 Lisp_Object result; |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4584 int hscroll; |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4585 struct window *w = XWINDOW (selected_window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4586 |
| 485 | 4587 if (NILP (arg)) |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4588 XSETFASTINT (arg, window_internal_width (w) - 2); |
| 265 | 4589 else |
| 4590 arg = Fprefix_numeric_value (arg); | |
| 4591 | |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4592 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
|
4593 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
|
4594 |
|
35772
22d10a2fa31a
(Fscroll_right, Fscroll_left): Use interactive_p
Gerd Moellmann <gerd@gnu.org>
parents:
35621
diff
changeset
|
4595 if (interactive_p (0)) |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4596 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
|
4597 |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4598 return result; |
| 265 | 4599 } |
| 4600 | |
|
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
4601 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 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
|
4602 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
|
4603 Default for ARG is window width minus 2. |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4604 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
|
4605 effect after the change. |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4606 If `automatic-hscrolling' is non-nil, the argument ARG modifies |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4607 a lower bound for automatic scrolling, i.e. automatic scrolling |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4608 will not scroll a window to a column less than the value returned |
|
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4609 by this function. */) |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4610 (arg) |
| 265 | 4611 register Lisp_Object arg; |
| 4612 { | |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4613 Lisp_Object result; |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4614 int hscroll; |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4615 struct window *w = XWINDOW (selected_window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4616 |
| 485 | 4617 if (NILP (arg)) |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4618 XSETFASTINT (arg, window_internal_width (w) - 2); |
| 265 | 4619 else |
| 4620 arg = Fprefix_numeric_value (arg); | |
| 4621 | |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4622 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
|
4623 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4624 |
|
35772
22d10a2fa31a
(Fscroll_right, Fscroll_left): Use interactive_p
Gerd Moellmann <gerd@gnu.org>
parents:
35621
diff
changeset
|
4625 if (interactive_p (0)) |
|
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4626 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
|
4627 |
|
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
4628 return result; |
| 265 | 4629 } |
| 4630 | |
|
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4631 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
|
4632 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
|
4633 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
|
4634 () |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4635 { |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4636 if (minibuf_level > 0 |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4637 && MINI_WINDOW_P (XWINDOW (selected_window)) |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4638 && !NILP (minibuf_selected_window) |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4639 && WINDOW_LIVE_P (minibuf_selected_window)) |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4640 return minibuf_selected_window; |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4641 |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4642 return Qnil; |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4643 } |
|
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
4644 |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4645 /* 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
|
4646 as opposed to its height. */ |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4647 |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4648 static int |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4649 displayed_window_lines (w) |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4650 struct window *w; |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4651 { |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4652 struct it it; |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4653 struct text_pos start; |
|
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
4654 int height = window_box_height (w); |
|
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4655 struct buffer *old_buffer; |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4656 int bottom_y; |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4657 |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4658 if (XBUFFER (w->buffer) != current_buffer) |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4659 { |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4660 old_buffer = current_buffer; |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4661 set_buffer_internal (XBUFFER (w->buffer)); |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4662 } |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4663 else |
|
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
4664 old_buffer = NULL; |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4665 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4666 /* 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
|
4667 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
|
4668 calls (recenter -1) while W->start is 1. */ |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4669 if (XMARKER (w->start)->charpos < BEGV) |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4670 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4671 else if (XMARKER (w->start)->charpos > ZV) |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4672 SET_TEXT_POS (start, ZV, ZV_BYTE); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4673 else |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4674 SET_TEXT_POS_FROM_MARKER (start, w->start); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4675 |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4676 start_display (&it, w, start); |
|
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
4677 move_it_vertically (&it, height); |
|
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4678 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
|
4679 |
|
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
4680 /* 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
|
4681 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
|
4682 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
|
4683 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
|
4684 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
|
4685 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
|
4686 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
|
4687 height++; |
|
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
4688 |
|
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
4689 /* 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
|
4690 if (bottom_y < height) |
|
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
4691 { |
|
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4692 int uy = CANON_Y_UNIT (it.f); |
|
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4693 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
|
4694 } |
|
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
4695 |
|
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4696 if (old_buffer) |
|
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4697 set_buffer_internal (old_buffer); |
|
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4698 |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4699 return it.vpos; |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4700 } |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4701 |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4702 |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4703 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
|
4704 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
|
4705 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
|
4706 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
|
4707 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
|
4708 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4709 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
|
4710 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
|
4711 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
|
4712 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
|
4713 (arg) |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4714 register Lisp_Object arg; |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4715 { |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4716 struct window *w = XWINDOW (selected_window); |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4717 struct buffer *buf = XBUFFER (w->buffer); |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4718 struct buffer *obuf = current_buffer; |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4719 int center_p = 0; |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4720 int charpos, bytepos; |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4721 |
|
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
4722 /* 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
|
4723 obuf->display_error_modiff = 0; |
|
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
4724 |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4725 if (NILP (arg)) |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4726 { |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4727 int i; |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4728 |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4729 /* Invalidate pixel data calculated for all compositions. */ |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4730 for (i = 0; i < n_compositions; i++) |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4731 composition_table[i]->font = NULL; |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4732 |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4733 Fredraw_frame (w->frame); |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4734 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4735 center_p = 1; |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4736 } |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4737 else if (CONSP (arg)) /* Just C-u. */ |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4738 center_p = 1; |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4739 else |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4740 { |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4741 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
|
4742 CHECK_NUMBER (arg); |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4743 } |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4744 |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4745 set_buffer_internal (buf); |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4746 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4747 /* 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
|
4748 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
|
4749 line counts would lead to strange effects. */ |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4750 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4751 { |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4752 if (center_p) |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4753 { |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4754 struct it it; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4755 struct text_pos pt; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4756 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4757 SET_TEXT_POS (pt, PT, PT_BYTE); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4758 start_display (&it, w, pt); |
|
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
4759 move_it_vertically (&it, - window_box_height (w) / 2); |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4760 charpos = IT_CHARPOS (it); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4761 bytepos = IT_BYTEPOS (it); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4762 } |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4763 else if (XINT (arg) < 0) |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4764 { |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4765 struct it it; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4766 struct text_pos pt; |
|
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4767 int y0, y1, h, nlines; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4768 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4769 SET_TEXT_POS (pt, PT, PT_BYTE); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4770 start_display (&it, w, pt); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4771 y0 = it.current_y; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4772 |
|
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4773 /* 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
|
4774 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
|
4775 and the lines below. */ |
|
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4776 nlines = - XINT (arg) - 1; |
|
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4777 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
|
4778 |
|
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
4779 y1 = line_bottom_y (&it); |
|
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4780 |
|
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4781 /* 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
|
4782 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
|
4783 if (it.vpos < nlines) |
|
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
4784 y1 += (nlines - it.vpos) * CANON_Y_UNIT (it.f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4785 |
|
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
4786 h = window_box_height (w) - (y1 - y0); |
|
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
4787 |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4788 start_display (&it, w, pt); |
|
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
4789 move_it_vertically (&it, - h); |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4790 charpos = IT_CHARPOS (it); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4791 bytepos = IT_BYTEPOS (it); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4792 } |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4793 else |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4794 { |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4795 struct position pos; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4796 pos = *vmotion (PT, - XINT (arg), w); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4797 charpos = pos.bufpos; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4798 bytepos = pos.bytepos; |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4799 } |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4800 } |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4801 else |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4802 { |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4803 struct position pos; |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4804 int ht = window_internal_height (w); |
|
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4805 |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4806 if (center_p) |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4807 arg = make_number (ht / 2); |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4808 else if (XINT (arg) < 0) |
|
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
4809 arg = make_number (XINT (arg) + ht); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4810 |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4811 pos = *vmotion (PT, - XINT (arg), w); |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4812 charpos = pos.bufpos; |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4813 bytepos = pos.bytepos; |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4814 } |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4815 |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4816 /* Set the new window start. */ |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4817 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
|
4818 w->window_end_valid = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4819 |
|
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
4820 w->optional_new_start = Qt; |
|
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
4821 |
|
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4822 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
|
4823 w->start_at_line_beg = Qt; |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4824 else |
|
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
4825 w->start_at_line_beg = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4826 |
|
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4827 set_buffer_internal (obuf); |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4828 return Qnil; |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4829 } |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4830 |
|
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
4831 |
|
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4832 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
|
4833 0, 1, 0, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4834 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
|
4835 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
|
4836 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
|
4837 (window) |
|
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4838 Lisp_Object window; |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4839 { |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4840 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
|
4841 int pixel_height = window_box_height (w); |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4842 int line_height = pixel_height / CANON_Y_UNIT (XFRAME (w->frame)); |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4843 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
|
4844 } |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4845 |
|
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
4846 |
| 265 | 4847 |
| 4848 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
|
4849 1, 1, "P", |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4850 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
|
4851 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
|
4852 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
|
4853 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
|
4854 (arg) |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4855 Lisp_Object arg; |
| 265 | 4856 { |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4857 struct window *w = XWINDOW (selected_window); |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4858 int lines, start; |
|
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
4859 Lisp_Object window; |
| 265 | 4860 |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4861 window = selected_window; |
| 265 | 4862 start = marker_position (w->start); |
| 4863 if (start < BEGV || start > ZV) | |
| 4864 { | |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4865 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
|
4866 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
|
4867 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
| 265 | 4868 w->start_at_line_beg = Fbolp (); |
| 4869 w->force_start = Qt; | |
| 4870 } | |
| 4871 else | |
|
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4872 Fgoto_char (w->start); |
| 265 | 4873 |
|
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4874 lines = displayed_window_lines (w); |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4875 if (NILP (arg)) |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4876 XSETFASTINT (arg, lines / 2); |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4877 else |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4878 { |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4879 arg = Fprefix_numeric_value (arg); |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4880 if (XINT (arg) < 0) |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4881 XSETINT (arg, XINT (arg) + lines); |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4882 } |
|
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
4883 |
|
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
4884 /* 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
|
4885 if (w->vscroll) |
|
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
4886 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
|
4887 |
|
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
4888 return Fvertical_motion (arg, window); |
| 265 | 4889 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4890 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4891 |
| 265 | 4892 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4893 /*********************************************************************** |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4894 Window Configuration |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4895 ***********************************************************************/ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4896 |
| 265 | 4897 struct save_window_data |
| 4898 { | |
|
15712
a272ccf6c225
(struct save_window_data, struct saved_window): First
Karl Heuer <kwzh@gnu.org>
parents:
15385
diff
changeset
|
4899 EMACS_INT size_from_Lisp_Vector_struct; |
| 265 | 4900 struct Lisp_Vector *next_from_Lisp_Vector_struct; |
|
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
4901 Lisp_Object frame_width, frame_height, 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
|
4902 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
|
4903 Lisp_Object selected_frame; |
| 265 | 4904 Lisp_Object current_window; |
| 4905 Lisp_Object current_buffer; | |
| 4906 Lisp_Object minibuf_scroll_window; | |
|
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
4907 Lisp_Object minibuf_selected_window; |
| 265 | 4908 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
|
4909 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
|
4910 /* 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
|
4911 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
|
4912 Lisp_Object min_width, min_height; |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
4913 /* 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
|
4914 for one window. */ |
| 265 | 4915 Lisp_Object saved_windows; |
| 4916 }; | |
|
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
4917 |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
4918 /* This is saved as a Lisp_Vector */ |
| 265 | 4919 struct saved_window |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4920 { |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4921 /* 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
|
4922 EMACS_INT size_from_Lisp_Vector_struct; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4923 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
|
4924 |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4925 Lisp_Object window; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4926 Lisp_Object buffer, start, pointm, mark; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4927 Lisp_Object left, top, width, height, hscroll, min_hscroll; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4928 Lisp_Object parent, prev; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4929 Lisp_Object start_at_line_beg; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4930 Lisp_Object display_table; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4931 Lisp_Object orig_top, orig_height; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4932 }; |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4933 |
|
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
4934 #define SAVED_WINDOW_VECTOR_SIZE 17 /* Arg to Fmake_vector */ |
| 265 | 4935 |
| 4936 #define SAVED_WINDOW_N(swv,n) \ | |
| 4937 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
| 4938 | |
| 4939 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
|
4940 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
|
4941 (object) |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4942 Lisp_Object object; |
| 265 | 4943 { |
|
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4944 if (WINDOW_CONFIGURATIONP (object)) |
| 265 | 4945 return Qt; |
| 4946 return Qnil; | |
| 4947 } | |
| 4948 | |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4949 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
|
4950 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
|
4951 (config) |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4952 Lisp_Object config; |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4953 { |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4954 register struct save_window_data *data; |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4955 struct Lisp_Vector *saved_windows; |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4956 |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4957 if (! WINDOW_CONFIGURATIONP (config)) |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4958 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
|
4959 |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4960 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
|
4961 saved_windows = XVECTOR (data->saved_windows); |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4962 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
|
4963 } |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4964 |
|
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
4965 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
|
4966 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
|
4967 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
|
4968 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
|
4969 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
|
4970 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
|
4971 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
|
4972 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
|
4973 (configuration) |
|
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
4974 Lisp_Object configuration; |
| 265 | 4975 { |
| 4976 register struct save_window_data *data; | |
| 4977 struct Lisp_Vector *saved_windows; | |
| 4978 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
|
4979 Lisp_Object frame; |
| 769 | 4980 FRAME_PTR f; |
|
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
4981 int old_point = -1; |
| 265 | 4982 |
|
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
4983 while (!WINDOW_CONFIGURATIONP (configuration)) |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
4984 wrong_type_argument (Qwindow_configuration_p, configuration); |
| 265 | 4985 |
|
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
4986 data = (struct save_window_data *) XVECTOR (configuration); |
| 265 | 4987 saved_windows = XVECTOR (data->saved_windows); |
| 4988 | |
| 4989 new_current_buffer = data->current_buffer; | |
| 485 | 4990 if (NILP (XBUFFER (new_current_buffer)->name)) |
| 265 | 4991 new_current_buffer = Qnil; |
|
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
4992 else |
|
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4993 { |
|
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4994 if (XBUFFER (new_current_buffer) == current_buffer) |
|
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4995 old_point = PT; |
|
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4996 else |
|
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4997 old_point = BUF_PT (XBUFFER (new_current_buffer)); |
|
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
4998 } |
| 265 | 4999 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5000 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
|
5001 f = XFRAME (frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5002 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5003 /* 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
|
5004 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
|
5005 if (FRAME_LIVE_P (f)) |
| 265 | 5006 { |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5007 register struct window *w; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5008 register struct saved_window *p; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5009 struct window *root_window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5010 struct window **leaf_windows; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5011 int n_leaf_windows; |
|
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5012 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
|
5013 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5014 /* 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
|
5015 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
|
5016 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
|
5017 back. We keep track of the prevailing height in these variables. */ |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5018 int previous_frame_height = FRAME_HEIGHT (f); |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5019 int previous_frame_width = FRAME_WIDTH (f); |
|
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
5020 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
|
5021 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
|
5022 |
| 18657 | 5023 /* The mouse highlighting code could get screwed up |
| 5024 if it runs during this. */ | |
| 5025 BLOCK_INPUT; | |
| 5026 | |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5027 if (XFASTINT (data->frame_height) != previous_frame_height |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5028 || XFASTINT (data->frame_width) != previous_frame_width) |
|
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5029 change_frame_size (f, XFASTINT (data->frame_height), |
|
25356
5db69f7aadca
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25315
diff
changeset
|
5030 XFASTINT (data->frame_width), 0, 0, 0); |
|
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5031 #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
|
5032 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
|
5033 != previous_frame_menu_bar_lines) |
|
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5034 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
|
5035 #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
|
5036 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
|
5037 != 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
|
5038 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
|
5039 #endif |
|
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5040 #endif |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5041 |
|
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5042 /* "Swap out" point from the selected window |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5043 into its buffer. We do this now, before |
|
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5044 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
|
5045 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
|
5046 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
|
5047 { |
|
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5048 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
|
5049 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
|
5050 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
|
5051 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
|
5052 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
|
5053 } |
|
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5054 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5055 windows_or_buffers_changed++; |
|
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
5056 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
|
5057 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5058 /* Problem: Freeing all matrices and later allocating them again |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5059 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
|
5060 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
|
5061 below. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5062 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5063 leaf_windows |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5064 = (struct window **) alloca (count_windows (root_window) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5065 * sizeof (struct window *)); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5066 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
|
5067 |
|
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
5068 /* 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
|
5069 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
|
5070 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
|
5071 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
|
5072 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5073 /* Kludge Alert! |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5074 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
|
5075 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
|
5076 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5077 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
|
5078 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
|
5079 dead. */ |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5080 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
|
5081 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5082 for (k = 0; k < saved_windows->size; k++) |
| 265 | 5083 { |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5084 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
|
5085 w = XWINDOW (p->window); |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5086 w->next = Qnil; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5087 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5088 if (!NILP (p->parent)) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5089 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
|
5090 XFASTINT (p->parent))->window; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5091 else |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5092 w->parent = Qnil; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5093 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5094 if (!NILP (p->prev)) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5095 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5096 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
|
5097 XFASTINT (p->prev))->window; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5098 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
|
5099 } |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5100 else |
| 265 | 5101 { |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5102 w->prev = Qnil; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5103 if (!NILP (w->parent)) |
| 265 | 5104 { |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5105 if (EQ (p->width, XWINDOW (w->parent)->width)) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5106 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5107 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
|
5108 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
|
5109 } |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5110 else |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5111 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5112 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
|
5113 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
|
5114 } |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5115 } |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5116 } |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5117 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5118 /* 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
|
5119 restore it now. */ |
|
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
5120 if (BUFFERP (w->height)) |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5121 w->buffer = w->height; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5122 w->left = p->left; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5123 w->top = p->top; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5124 w->width = p->width; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5125 w->height = p->height; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5126 w->hscroll = p->hscroll; |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5127 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
|
5128 w->display_table = p->display_table; |
|
34090
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
5129 w->orig_top = p->orig_top; |
|
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
5130 w->orig_height = p->orig_height; |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5131 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
|
5132 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
|
5133 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5134 /* 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
|
5135 if (NILP (p->buffer)) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5136 w->buffer = p->buffer; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5137 else |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5138 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5139 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
|
5140 /* 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
|
5141 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5142 w->buffer = p->buffer; |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5149 /* 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
|
5150 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
|
5151 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
|
5152 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
|
5153 && 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
|
5154 Fgoto_char (w->pointm); |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5155 } |
|
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
5156 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
|
5157 /* 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
|
5158 { |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5159 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
|
5160 /* 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
|
5161 range. */ |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5162 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
|
5163 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
|
5164 w->start_at_line_beg = Qt; |
| 265 | 5165 } |
| 5166 else | |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5167 /* 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
|
5168 are real. */ |
| 265 | 5169 { |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5170 /* 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
|
5171 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
|
5172 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
|
5173 w->buffer); |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5174 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
|
5175 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
|
5176 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
|
5177 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
|
5178 w->start_at_line_beg = Qt; |
| 265 | 5179 } |
| 5180 } | |
| 5181 } | |
|
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
5182 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5183 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
|
5184 /* 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
|
5185 using the buffer that has been restored into it. |
|
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5186 Use the point value from the beginning of this function |
|
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5187 since unshow_buffer (called from delete_all_subwindows) |
|
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5188 could have altered it. */ |
|
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5189 selected_window = Qnil; |
|
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5190 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
|
5191 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
|
5192 make_number (old_point), |
|
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5193 XWINDOW (data->current_window)->buffer); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5194 |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5195 Fselect_window (data->current_window); |
|
17678
c13cd575945a
(Fset_window_configuration): Set last_selected_window
Richard M. Stallman <rms@gnu.org>
parents:
17628
diff
changeset
|
5196 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
|
5197 = selected_window; |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5198 |
|
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5199 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
|
5200 || (FRAMEP (data->focus_frame) |
|
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5201 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
|
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5202 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
|
5203 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5204 #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
|
5205 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
|
5206 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
|
5207 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
|
5208 0, 0); |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5209 #endif |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5210 |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5211 /* Set the screen height to the value it had before this function. */ |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5212 if (previous_frame_height != FRAME_HEIGHT (f) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5213 || previous_frame_width != FRAME_WIDTH (f)) |
|
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5214 change_frame_size (f, previous_frame_height, previous_frame_width, |
|
25356
5db69f7aadca
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25315
diff
changeset
|
5215 0, 0, 0); |
|
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5216 #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
|
5217 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
|
5218 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
|
5219 make_number (0)); |
|
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5220 #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
|
5221 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
|
5222 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
|
5223 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
|
5224 #endif |
|
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5225 #endif |
| 18657 | 5226 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5227 /* 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
|
5228 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
|
5229 { |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5230 if (NILP (leaf_windows[i]->buffer)) |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5231 { |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5232 /* Assert it's not reused as a combination. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5233 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
|
5234 && NILP (leaf_windows[i]->vchild)); |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5235 free_window_matrices (leaf_windows[i]); |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5236 } |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5237 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
|
5238 ++n; |
|
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5239 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5240 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5241 adjust_glyphs (f); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5242 |
| 18657 | 5243 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
|
5244 |
|
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5245 /* 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
|
5246 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
|
5247 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
|
5248 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
|
5249 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
|
5250 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
|
5251 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
|
5252 |
|
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5253 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
|
5254 && ! 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
|
5255 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
| 265 | 5256 } |
| 5257 | |
|
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5258 if (!NILP (new_current_buffer)) |
|
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5259 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
|
5260 |
|
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5261 /* 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
|
5262 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
|
5263 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
|
5264 |
| 265 | 5265 Vminibuf_scroll_window = data->minibuf_scroll_window; |
|
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
5266 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
|
5267 |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5268 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
| 265 | 5269 } |
| 5270 | |
| 769 | 5271 /* Mark all windows now on frame as deleted |
| 265 | 5272 by setting their buffers to nil. */ |
| 5273 | |
|
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5274 void |
| 265 | 5275 delete_all_subwindows (w) |
| 5276 register struct window *w; | |
| 5277 { | |
| 485 | 5278 if (!NILP (w->next)) |
| 265 | 5279 delete_all_subwindows (XWINDOW (w->next)); |
| 485 | 5280 if (!NILP (w->vchild)) |
| 265 | 5281 delete_all_subwindows (XWINDOW (w->vchild)); |
| 485 | 5282 if (!NILP (w->hchild)) |
| 265 | 5283 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
|
5284 |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5285 w->height = w->buffer; /* See Fset_window_configuration for excuse. */ |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5286 |
|
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5287 if (!NILP (w->buffer)) |
|
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5288 unshow_buffer (w); |
|
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5289 |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5290 /* 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
|
5291 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
|
5292 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
|
5293 vchild or hchild set. */ |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5294 w->buffer = Qnil; |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5295 w->vchild = Qnil; |
|
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5296 w->hchild = Qnil; |
|
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5297 |
|
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5298 Vwindow_list = Qnil; |
| 265 | 5299 } |
| 5300 | |
| 5301 static int | |
| 5302 count_windows (window) | |
| 5303 register struct window *window; | |
| 5304 { | |
| 5305 register int count = 1; | |
| 485 | 5306 if (!NILP (window->next)) |
| 265 | 5307 count += count_windows (XWINDOW (window->next)); |
| 485 | 5308 if (!NILP (window->vchild)) |
| 265 | 5309 count += count_windows (XWINDOW (window->vchild)); |
| 485 | 5310 if (!NILP (window->hchild)) |
| 265 | 5311 count += count_windows (XWINDOW (window->hchild)); |
| 5312 return count; | |
| 5313 } | |
| 5314 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5315 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5316 /* 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
|
5317 Value is last index + 1. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5318 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5319 static int |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5320 get_leaf_windows (w, flat, i) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5321 struct window *w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5322 struct window **flat; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5323 int i; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5324 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5325 while (w) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5326 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5327 if (!NILP (w->hchild)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5328 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5329 else if (!NILP (w->vchild)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5330 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5331 else |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5332 flat[i++] = w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5333 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5334 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5335 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5336 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5337 return i; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5338 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5339 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5340 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5341 /* 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
|
5342 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
|
5343 can be returned. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5344 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5345 struct glyph * |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5346 get_phys_cursor_glyph (w) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5347 struct window *w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5348 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5349 struct glyph_row *row; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5350 struct glyph *glyph; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5351 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5352 if (w->phys_cursor.vpos >= 0 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5353 && w->phys_cursor.vpos < w->current_matrix->nrows |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5354 && (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
|
5355 row->enabled_p) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5356 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5357 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5358 else |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5359 glyph = NULL; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5360 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5361 return glyph; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5362 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5363 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5364 |
| 265 | 5365 static int |
| 5366 save_window_save (window, vector, i) | |
| 5367 Lisp_Object window; | |
| 5368 struct Lisp_Vector *vector; | |
| 5369 int i; | |
| 5370 { | |
| 5371 register struct saved_window *p; | |
| 5372 register struct window *w; | |
| 5373 register Lisp_Object tem; | |
| 5374 | |
| 485 | 5375 for (;!NILP (window); window = w->next) |
| 265 | 5376 { |
| 5377 p = SAVED_WINDOW_N (vector, i); | |
| 5378 w = XWINDOW (window); | |
| 5379 | |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5380 XSETFASTINT (w->temslot, i++); |
| 265 | 5381 p->window = window; |
| 5382 p->buffer = w->buffer; | |
| 5383 p->left = w->left; | |
| 5384 p->top = w->top; | |
| 5385 p->width = w->width; | |
| 5386 p->height = w->height; | |
| 5387 p->hscroll = w->hscroll; | |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5388 p->min_hscroll = w->min_hscroll; |
| 265 | 5389 p->display_table = w->display_table; |
|
34090
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
5390 p->orig_top = w->orig_top; |
|
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
5391 p->orig_height = w->orig_height; |
| 485 | 5392 if (!NILP (w->buffer)) |
| 265 | 5393 { |
| 5394 /* Save w's value of point in the window configuration. | |
| 5395 If w is the selected window, then get the value of point | |
| 5396 from the buffer; pointm is garbage in the selected window. */ | |
| 5397 if (EQ (window, selected_window)) | |
| 5398 { | |
| 5399 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
|
5400 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
|
5401 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
|
5402 BUF_PT_BYTE (XBUFFER (w->buffer))); |
| 265 | 5403 } |
| 5404 else | |
|
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
5405 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
|
5406 |
|
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
5407 p->start = Fcopy_marker (w->start, Qnil); |
| 265 | 5408 p->start_at_line_beg = w->start_at_line_beg; |
| 5409 | |
| 5410 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
|
5411 p->mark = Fcopy_marker (tem, Qnil); |
| 265 | 5412 } |
| 5413 else | |
| 5414 { | |
| 5415 p->pointm = Qnil; | |
| 5416 p->start = Qnil; | |
| 5417 p->mark = Qnil; | |
| 5418 p->start_at_line_beg = Qnil; | |
| 5419 } | |
| 5420 | |
| 485 | 5421 if (NILP (w->parent)) |
| 265 | 5422 p->parent = Qnil; |
| 5423 else | |
| 5424 p->parent = XWINDOW (w->parent)->temslot; | |
| 5425 | |
| 485 | 5426 if (NILP (w->prev)) |
| 265 | 5427 p->prev = Qnil; |
| 5428 else | |
| 5429 p->prev = XWINDOW (w->prev)->temslot; | |
| 5430 | |
| 485 | 5431 if (!NILP (w->vchild)) |
| 265 | 5432 i = save_window_save (w->vchild, vector, i); |
| 485 | 5433 if (!NILP (w->hchild)) |
| 265 | 5434 i = save_window_save (w->hchild, vector, i); |
| 5435 } | |
| 5436 | |
| 5437 return i; | |
| 5438 } | |
| 5439 | |
|
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
5440 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
|
5441 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
|
5442 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
|
5443 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
|
5444 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
|
5445 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
|
5446 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
|
5447 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
|
5448 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
|
5449 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
|
5450 (frame) |
| 769 | 5451 Lisp_Object frame; |
| 265 | 5452 { |
| 5453 register Lisp_Object tem; | |
| 5454 register int n_windows; | |
| 5455 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
|
5456 register struct Lisp_Vector *vec; |
| 265 | 5457 register int i; |
| 769 | 5458 FRAME_PTR f; |
| 265 | 5459 |
| 769 | 5460 if (NILP (frame)) |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5461 frame = selected_frame; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5462 CHECK_LIVE_FRAME (frame); |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5463 f = XFRAME (frame); |
| 358 | 5464 |
| 769 | 5465 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
|
5466 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
|
5467 data = (struct save_window_data *)vec; |
|
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
5468 |
|
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5469 XSETFASTINT (data->frame_width, FRAME_WIDTH (f)); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5470 XSETFASTINT (data->frame_height, FRAME_HEIGHT (f)); |
|
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5471 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
|
5472 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
|
5473 data->selected_frame = selected_frame; |
| 769 | 5474 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
|
5475 XSETBUFFER (data->current_buffer, current_buffer); |
|
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5476 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
|
5477 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
| 769 | 5478 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
|
5479 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
|
5480 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
|
5481 XSETINT (data->min_width, window_min_width); |
| 265 | 5482 tem = Fmake_vector (make_number (n_windows), Qnil); |
| 5483 data->saved_windows = tem; | |
| 5484 for (i = 0; i < n_windows; i++) | |
| 5485 XVECTOR (tem)->contents[i] | |
| 5486 = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil); | |
|
34090
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
5487 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
|
5488 XSETWINDOW_CONFIGURATION (tem, data); |
| 265 | 5489 return (tem); |
| 5490 } | |
| 5491 | |
| 5492 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
|
5493 0, UNEVALLED, 0, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5494 doc: /* Execute body, preserving window sizes and contents. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5495 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
|
5496 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
|
5497 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
|
5498 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
|
5499 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
|
5500 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
|
5501 (args) |
| 265 | 5502 Lisp_Object args; |
| 5503 { | |
| 5504 register Lisp_Object val; | |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
5505 register int count = SPECPDL_INDEX (); |
| 265 | 5506 |
| 5507 record_unwind_protect (Fset_window_configuration, | |
| 358 | 5508 Fcurrent_window_configuration (Qnil)); |
| 265 | 5509 val = Fprogn (args); |
| 5510 return unbind_to (count, val); | |
| 5511 } | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5512 |
| 265 | 5513 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5514 /*********************************************************************** |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5515 Marginal Areas |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5516 ***********************************************************************/ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5517 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5518 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
|
5519 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
|
5520 doc: /* Set 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
|
5521 If window is nil, set margins of 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
|
5522 First parameter LEFT-WIDTH specifies the number of character |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5523 cells to reserve for the left marginal area. Second parameter |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5524 RIGHT-WIDTH does the same for the right marginal area. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5525 A nil width parameter means no margin. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5526 (window, left, right) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5527 Lisp_Object window, left, right; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5528 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5529 struct window *w = decode_window (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5530 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5531 if (!NILP (left)) |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5532 CHECK_NUMBER_OR_FLOAT (left); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5533 if (!NILP (right)) |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5534 CHECK_NUMBER_OR_FLOAT (right); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5535 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5536 /* Check widths < 0 and translate a zero width to nil. |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5537 Margins that are too wide have to be checked elsewhere. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5538 if ((INTEGERP (left) && XINT (left) < 0) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26153
diff
changeset
|
5539 || (FLOATP (left) && XFLOAT_DATA (left) <= 0)) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5540 XSETFASTINT (left, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5541 if (INTEGERP (left) && XFASTINT (left) == 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5542 left = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5543 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5544 if ((INTEGERP (right) && XINT (right) < 0) |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26153
diff
changeset
|
5545 || (FLOATP (right) && XFLOAT_DATA (right) <= 0)) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5546 XSETFASTINT (right, 0); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5547 if (INTEGERP (right) && XFASTINT (right) == 0) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5548 right = Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5549 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5550 w->left_margin_width = left; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5551 w->right_margin_width = right; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5552 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5553 ++windows_or_buffers_changed; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5554 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5555 return Qnil; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5556 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5557 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5558 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5559 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5560 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
|
5561 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
|
5562 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
|
5563 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
|
5564 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
|
5565 as nil. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5566 (window) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5567 Lisp_Object window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5568 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5569 struct window *w = decode_window (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5570 return Fcons (w->left_margin_width, w->right_margin_width); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5571 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5572 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5573 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5574 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5575 /*********************************************************************** |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5576 Smooth scrolling |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5577 ***********************************************************************/ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5578 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5579 DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 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
|
5580 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
|
5581 Use the selected window if WINDOW is nil or omitted. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5582 Value is a multiple of the canonical character height of WINDOW. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5583 (window) |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5584 Lisp_Object window; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5585 { |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5586 Lisp_Object result; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5587 struct frame *f; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5588 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5589 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5590 if (NILP (window)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5591 window = selected_window; |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5592 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5593 CHECK_WINDOW (window); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5594 w = XWINDOW (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5595 f = XFRAME (w->frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5596 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5597 if (FRAME_WINDOW_P (f)) |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5598 result = CANON_Y_FROM_PIXEL_Y (f, -w->vscroll); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5599 else |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5600 result = make_number (0); |
|
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5601 return result; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5602 } |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5603 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5604 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5605 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll, |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5606 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
|
5607 doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL. |
|
41503
e76f8f07cc9d
(Fset_window_vscroll): Doc fix. From Kalle Olavi Niemitalo <kon@iki.fi>.
Eli Zaretskii <eliz@gnu.org>
parents:
41127
diff
changeset
|
5608 WINDOW nil means use the selected window. VSCROLL is a non-negative |
|
e76f8f07cc9d
(Fset_window_vscroll): Doc fix. From Kalle Olavi Niemitalo <kon@iki.fi>.
Eli Zaretskii <eliz@gnu.org>
parents:
41127
diff
changeset
|
5609 multiple of the canonical character height of WINDOW. */) |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5610 (window, vscroll) |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5611 Lisp_Object window, vscroll; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5612 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5613 struct window *w; |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5614 struct frame *f; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5615 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5616 if (NILP (window)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5617 window = selected_window; |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5618 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5619 CHECK_WINDOW (window); |
|
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5620 CHECK_NUMBER_OR_FLOAT (vscroll); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5621 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5622 w = XWINDOW (window); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5623 f = XFRAME (w->frame); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5624 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5625 if (FRAME_WINDOW_P (f)) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5626 { |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5627 int old_dy = w->vscroll; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5628 |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5629 w->vscroll = - CANON_Y_UNIT (f) * XFLOATINT (vscroll); |
|
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5630 w->vscroll = min (w->vscroll, 0); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5631 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5632 /* Adjust glyph matrix of the frame if the virtual display |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5633 area becomes larger than before. */ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5634 if (w->vscroll < 0 && w->vscroll < old_dy) |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5635 adjust_glyphs (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5636 |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5637 /* Prevent redisplay shortcuts. */ |
| 25375 | 5638 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5639 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5640 |
|
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5641 return Fwindow_vscroll (window); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5642 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5643 |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5644 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5645 /* 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
|
5646 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
|
5647 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
|
5648 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5649 void |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5650 foreach_window (f, fn, user_data) |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5651 struct frame *f; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5652 int (* fn) P_ ((struct window *, void *)); |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5653 void *user_data; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5654 { |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5655 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
|
5656 } |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5657 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5658 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5659 /* 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
|
5660 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
|
5661 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
|
5662 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
|
5663 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5664 static int |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5665 foreach_window_1 (w, fn, user_data) |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5666 struct window *w; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5667 int (* fn) P_ ((struct window *, void *)); |
|
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5668 void *user_data; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5669 { |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5670 int cont; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5671 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5672 for (cont = 1; w && cont;) |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5673 { |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5674 if (!NILP (w->hchild)) |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5675 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
|
5676 else if (!NILP (w->vchild)) |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5677 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5678 else |
|
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
5679 cont = fn (w, user_data); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5680 |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5681 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5682 } |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5683 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5684 return cont; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5685 } |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5686 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5687 |
| 39952 | 5688 /* 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
|
5689 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
|
5690 the window start. */ |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5691 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5692 static int |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5693 freeze_window_start (w, freeze_p) |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5694 struct window *w; |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5695 void *freeze_p; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5696 { |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5697 if (w == XWINDOW (selected_window) |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5698 || MINI_WINDOW_P (w) |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5699 || (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
|
5700 && ! NILP (Vminibuf_scroll_window) |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5701 && w == XWINDOW (Vminibuf_scroll_window))) |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5702 freeze_p = NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5703 |
|
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
5704 w->frozen_window_start_p = freeze_p != NULL; |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5705 return 1; |
|
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5706 } |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5707 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5708 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5709 /* 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
|
5710 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
|
5711 means freeze the window start. */ |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5712 |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5713 void |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5714 freeze_window_starts (f, freeze_p) |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5715 struct frame *f; |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5716 int freeze_p; |
|
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
5717 { |
|
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
5718 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
|
5719 } |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5720 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5721 |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5722 /*********************************************************************** |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5723 Initialization |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5724 ***********************************************************************/ |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5725 |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5726 /* Return 1 if window configurations C1 and C2 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5727 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
|
5728 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5729 int |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5730 compare_window_configurations (c1, c2, ignore_positions) |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5731 Lisp_Object c1, c2; |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5732 int ignore_positions; |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5733 { |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5734 register struct save_window_data *d1, *d2; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5735 struct Lisp_Vector *sw1, *sw2; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5736 int i; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5737 |
|
28505
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
5738 if (!WINDOW_CONFIGURATIONP (c1)) |
|
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
5739 wrong_type_argument (Qwindow_configuration_p, c1); |
|
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
5740 if (!WINDOW_CONFIGURATIONP (c2)) |
|
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
5741 wrong_type_argument (Qwindow_configuration_p, c2); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5742 |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5743 d1 = (struct save_window_data *) XVECTOR (c1); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5744 d2 = (struct save_window_data *) XVECTOR (c2); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5745 sw1 = XVECTOR (d1->saved_windows); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5746 sw2 = XVECTOR (d2->saved_windows); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5747 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5748 if (! EQ (d1->frame_width, d2->frame_width)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5749 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5750 if (! EQ (d1->frame_height, d2->frame_height)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5751 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5752 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
|
5753 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5754 if (! EQ (d1->selected_frame, d2->selected_frame)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5755 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5756 /* Don't compare the current_window field directly. |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5757 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
|
5758 if (! EQ (d1->current_buffer, d2->current_buffer)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5759 return 0; |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5760 if (! ignore_positions) |
|
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5761 { |
|
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5762 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
|
5763 return 0; |
|
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5764 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
|
5765 return 0; |
|
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5766 } |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5767 /* Don't compare the root_window field. |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5768 We don't require the two configurations |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5769 to use the same window object, |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5770 and the two root windows must be equivalent |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5771 if everything else compares equal. */ |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5772 if (! EQ (d1->focus_frame, d2->focus_frame)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5773 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5774 if (! EQ (d1->min_width, d2->min_width)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5775 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5776 if (! EQ (d1->min_height, d2->min_height)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5777 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5778 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5779 /* 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
|
5780 if (sw1->size != sw2->size) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5781 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5782 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5783 for (i = 0; i < sw1->size; i++) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5784 { |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5785 struct saved_window *p1, *p2; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5786 int w1_is_current, w2_is_current; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5787 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5788 p1 = SAVED_WINDOW_N (sw1, i); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5789 p2 = SAVED_WINDOW_N (sw2, i); |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5790 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5791 /* Verify that the current windows in the two |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5792 configurations correspond to each other. */ |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5793 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
|
5794 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
|
5795 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5796 if (w1_is_current != w2_is_current) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5797 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5798 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5799 /* Verify that the corresponding windows do match. */ |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5800 if (! EQ (p1->buffer, p2->buffer)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5801 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5802 if (! EQ (p1->left, p2->left)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5803 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5804 if (! EQ (p1->top, p2->top)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5805 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5806 if (! EQ (p1->width, p2->width)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5807 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5808 if (! EQ (p1->height, p2->height)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5809 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5810 if (! EQ (p1->display_table, p2->display_table)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5811 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5812 if (! EQ (p1->parent, p2->parent)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5813 return 0; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5814 if (! EQ (p1->prev, p2->prev)) |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5815 return 0; |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5816 if (! ignore_positions) |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5817 { |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5818 if (! EQ (p1->hscroll, p2->hscroll)) |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5819 return 0; |
|
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5820 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
|
5821 return 0; |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5822 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
|
5823 return 0; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5824 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
|
5825 return 0; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5826 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
|
5827 return 0; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5828 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
|
5829 return 0; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5830 } |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5831 } |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5832 |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5833 return 1; |
|
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5834 } |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5835 |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5836 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
|
5837 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
|
5838 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
|
5839 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
|
5840 and scrolling positions. */) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5841 (x, y) |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5842 Lisp_Object x, y; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5843 { |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5844 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
|
5845 return Qt; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5846 return Qnil; |
|
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
5847 } |
|
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5848 |
| 21514 | 5849 void |
| 265 | 5850 init_window_once () |
| 5851 { | |
|
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5852 struct frame *f = make_terminal_frame (); |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5853 XSETFRAME (selected_frame, f); |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5854 Vterminal_frame = selected_frame; |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5855 minibuf_window = f->minibuffer_window; |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5856 selected_window = f->selected_window; |
|
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5857 last_nonminibuf_frame = f; |
|
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
5858 |
|
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
5859 window_initialized = 1; |
| 265 | 5860 } |
| 5861 | |
| 21514 | 5862 void |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5863 init_window () |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5864 { |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5865 Vwindow_list = Qnil; |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5866 } |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5867 |
|
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5868 void |
| 265 | 5869 syms_of_window () |
| 5870 { | |
|
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
5871 Qwindow_size_fixed = intern ("window-size-fixed"); |
|
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
5872 staticpro (&Qwindow_size_fixed); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5873 |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
5874 staticpro (&Qwindow_configuration_change_hook); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
5875 Qwindow_configuration_change_hook |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
5876 = intern ("window-configuration-change-hook"); |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
5877 |
| 265 | 5878 Qwindowp = intern ("windowp"); |
| 5879 staticpro (&Qwindowp); | |
| 5880 | |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5881 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
|
5882 staticpro (&Qwindow_configuration_p); |
|
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5883 |
|
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
5884 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
|
5885 staticpro (&Qwindow_live_p); |
|
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5886 |
|
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
5887 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
|
5888 staticpro (&Qtemp_buffer_show_hook); |
|
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
5889 |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5890 staticpro (&Vwindow_list); |
|
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
5891 |
|
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
5892 minibuf_selected_window = Qnil; |
|
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
5893 staticpro (&minibuf_selected_window); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
5894 |
| 265 | 5895 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
|
5896 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
|
5897 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
|
5898 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
|
5899 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
|
5900 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
| 265 | 5901 Vtemp_buffer_show_function = Qnil; |
| 5902 | |
| 5903 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
|
5904 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
|
5905 It will receive two args, the buffer and a flag which if non-nil means |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5906 that the currently selected window is not acceptable. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5907 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
|
5908 work using this function. */); |
| 265 | 5909 Vdisplay_buffer_function = Qnil; |
| 5910 | |
|
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
5911 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
|
5912 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
|
5913 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
|
5914 Veven_window_heights = Qt; |
|
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
5915 |
| 265 | 5916 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
|
5917 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
| 265 | 5918 Vminibuf_scroll_window = Qnil; |
| 5919 | |
|
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
5920 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
|
5921 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
|
5922 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
|
5923 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
|
5924 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
|
5925 |
| 265 | 5926 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
|
5927 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
| 265 | 5928 Vother_window_scroll_buffer = Qnil; |
| 5929 | |
| 769 | 5930 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
|
5931 doc: /* *Non-nil means `display-buffer' should make a separate frame. */); |
| 769 | 5932 pop_up_frames = 0; |
| 265 | 5933 |
|
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
5934 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
|
5935 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
|
5936 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
|
5937 display_buffer_reuse_frames = 0; |
|
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
5938 |
| 769 | 5939 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
|
5940 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
|
5941 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
|
5942 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5943 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
|
5944 where `pop-up-frame-alist' would hold the default frame parameters. */); |
| 769 | 5945 Vpop_up_frame_function = Qnil; |
| 265 | 5946 |
|
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
5947 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
|
5948 doc: /* *List of buffer names that should have their own special frames. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5949 Displaying a buffer whose name is in this list makes a special frame for it |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5950 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
|
5951 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5952 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
|
5953 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
|
5954 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5955 In the first case, FRAME-PARAMETERS are used to create the frame. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5956 In the latter case, FUNCTION is called with BUFFER as the first argument, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5957 followed by OTHER-ARGS--it can display BUFFER in any way it likes. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5958 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
|
5959 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5960 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
|
5961 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
|
5962 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
|
5963 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
|
5964 Vspecial_display_buffer_names = Qnil; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
5965 |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
5966 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
|
5967 doc: /* *List of regexps saying which buffers should have their own special frames. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5968 If a buffer name matches one of these regexps, it gets its own frame. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5969 Displaying a buffer whose name is in this list makes a special frame for it |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5970 using `special-display-function'. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5971 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5972 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
|
5973 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
|
5974 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5975 In the first case, FRAME-PARAMETERS are used to create the frame. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5976 In the latter case, FUNCTION is called with the buffer as first argument, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5977 followed by OTHER-ARGS--it can display the buffer in any way it likes. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5978 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
|
5979 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5980 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
|
5981 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
|
5982 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
|
5983 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
|
5984 Vspecial_display_regexps = Qnil; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
5985 |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
5986 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
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 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
|
5992 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
|
5993 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
|
5994 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
|
5995 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
|
5996 |
|
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
5997 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
|
5998 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
|
5999 Vspecial_display_function = Qnil; |
|
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6000 |
|
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6001 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
|
6002 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
|
6003 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
|
6004 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
|
6005 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
|
6006 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6007 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
|
6008 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
|
6009 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
|
6010 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
|
6011 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6012 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
|
6013 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
|
6014 |
|
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6015 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
|
6016 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
|
6017 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
|
6018 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
|
6019 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
|
6020 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6021 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
|
6022 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
|
6023 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
|
6024 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
|
6025 |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6026 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
|
6027 Vsame_window_regexps = Qnil; |
|
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6028 |
| 265 | 6029 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
|
6030 doc: /* *Non-nil means display-buffer should make new windows. */); |
| 265 | 6031 pop_up_windows = 1; |
| 6032 | |
| 6033 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
|
6034 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
| 265 | 6035 next_screen_context_lines = 2; |
| 6036 | |
| 6037 DEFVAR_INT ("split-height-threshold", &split_height_threshold, | |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6038 doc: /* *display-buffer would prefer to split the largest window if this large. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6039 If there is only one window, it is split regardless of this value. */); |
| 265 | 6040 split_height_threshold = 500; |
| 6041 | |
| 6042 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
|
6043 doc: /* *Delete any window less than this tall (including its mode line). */); |
| 265 | 6044 window_min_height = 4; |
| 6045 | |
| 6046 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
|
6047 doc: /* *Delete any window less than this wide. */); |
| 265 | 6048 window_min_width = 10; |
| 6049 | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6050 DEFVAR_LISP ("scroll-preserve-screen-position", |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6051 &Vscroll_preserve_screen_position, |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6052 doc: /* *Non-nil means scroll commands move point to keep its screen line unchanged. */); |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6053 Vscroll_preserve_screen_position = Qnil; |
|
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
6054 |
|
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6055 DEFVAR_LISP ("window-configuration-change-hook", |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6056 &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
|
6057 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
|
6058 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
|
6059 Vwindow_configuration_change_hook = Qnil; |
|
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6060 |
|
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6061 DEFVAR_BOOL ("window-size-fixed", &window_size_fixed, |
|
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6062 doc: /* Non-nil in a buffer means windows displaying the buffer are fixed-size. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6063 Emacs won't change the size of any window displaying that buffer, |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6064 unless you explicitly change the size, or Emacs has no other choice. |
|
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Jan?k <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6065 This variable automatically becomes buffer-local when set. */); |
|
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6066 Fmake_variable_buffer_local (Qwindow_size_fixed); |
|
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6067 window_size_fixed = 0; |
|
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6068 |
| 265 | 6069 defsubr (&Sselected_window); |
| 6070 defsubr (&Sminibuffer_window); | |
| 6071 defsubr (&Swindow_minibuffer_p); | |
| 6072 defsubr (&Swindowp); | |
|
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
6073 defsubr (&Swindow_live_p); |
| 265 | 6074 defsubr (&Spos_visible_in_window_p); |
| 6075 defsubr (&Swindow_buffer); | |
| 6076 defsubr (&Swindow_height); | |
| 6077 defsubr (&Swindow_width); | |
| 6078 defsubr (&Swindow_hscroll); | |
| 6079 defsubr (&Sset_window_hscroll); | |
|
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6080 defsubr (&Swindow_redisplay_end_trigger); |
|
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6081 defsubr (&Sset_window_redisplay_end_trigger); |
| 265 | 6082 defsubr (&Swindow_edges); |
| 432 | 6083 defsubr (&Scoordinates_in_window_p); |
| 6084 defsubr (&Swindow_at); | |
| 265 | 6085 defsubr (&Swindow_point); |
| 6086 defsubr (&Swindow_start); | |
| 6087 defsubr (&Swindow_end); | |
| 6088 defsubr (&Sset_window_point); | |
| 6089 defsubr (&Sset_window_start); | |
| 6090 defsubr (&Swindow_dedicated_p); | |
|
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
6091 defsubr (&Sset_window_dedicated_p); |
| 265 | 6092 defsubr (&Swindow_display_table); |
| 6093 defsubr (&Sset_window_display_table); | |
| 6094 defsubr (&Snext_window); | |
| 6095 defsubr (&Sprevious_window); | |
| 6096 defsubr (&Sother_window); | |
| 6097 defsubr (&Sget_lru_window); | |
| 6098 defsubr (&Sget_largest_window); | |
| 6099 defsubr (&Sget_buffer_window); | |
| 6100 defsubr (&Sdelete_other_windows); | |
| 6101 defsubr (&Sdelete_windows_on); | |
| 6102 defsubr (&Sreplace_buffer_in_windows); | |
| 6103 defsubr (&Sdelete_window); | |
| 6104 defsubr (&Sset_window_buffer); | |
| 6105 defsubr (&Sselect_window); | |
|
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6106 defsubr (&Sspecial_display_p); |
|
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6107 defsubr (&Ssame_window_p); |
| 265 | 6108 defsubr (&Sdisplay_buffer); |
| 6109 defsubr (&Ssplit_window); | |
| 6110 defsubr (&Senlarge_window); | |
| 6111 defsubr (&Sshrink_window); | |
| 6112 defsubr (&Sscroll_up); | |
| 6113 defsubr (&Sscroll_down); | |
| 6114 defsubr (&Sscroll_left); | |
| 6115 defsubr (&Sscroll_right); | |
|
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
6116 defsubr (&Sother_window_for_scrolling); |
| 265 | 6117 defsubr (&Sscroll_other_window); |
|
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
6118 defsubr (&Sminibuffer_selected_window); |
| 265 | 6119 defsubr (&Srecenter); |
|
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
6120 defsubr (&Swindow_text_height); |
| 265 | 6121 defsubr (&Smove_to_window_line); |
| 6122 defsubr (&Swindow_configuration_p); | |
|
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6123 defsubr (&Swindow_configuration_frame); |
| 265 | 6124 defsubr (&Sset_window_configuration); |
| 6125 defsubr (&Scurrent_window_configuration); | |
| 6126 defsubr (&Ssave_window_excursion); | |
|
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6127 defsubr (&Sset_window_margins); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6128 defsubr (&Swindow_margins); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6129 defsubr (&Swindow_vscroll); |
|
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6130 defsubr (&Sset_window_vscroll); |
|
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6131 defsubr (&Scompare_window_configurations); |
|
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6132 defsubr (&Swindow_list); |
| 265 | 6133 } |
| 6134 | |
| 21514 | 6135 void |
| 265 | 6136 keys_of_window () |
| 6137 { | |
| 6138 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
| 6139 initial_define_key (control_x_map, '2', "split-window"); | |
| 6140 initial_define_key (control_x_map, '0', "delete-window"); | |
| 6141 initial_define_key (control_x_map, 'o', "other-window"); | |
| 6142 initial_define_key (control_x_map, '^', "enlarge-window"); | |
| 6143 initial_define_key (control_x_map, '<', "scroll-left"); | |
| 6144 initial_define_key (control_x_map, '>', "scroll-right"); | |
| 6145 | |
| 6146 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
| 6147 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
| 6148 initial_define_key (meta_map, 'v', "scroll-down"); | |
| 6149 | |
| 6150 initial_define_key (global_map, Ctl('L'), "recenter"); | |
| 6151 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
| 6152 } |
