Mercurial > emacs
annotate src/xdisp.c @ 19922:a59d59d582b7
(setup-english-environment): Don't set
the terminal and keyboard coding systems.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 13 Sep 1997 19:49:52 +0000 |
parents | 0ee6d171e8af |
children | 83d32ee54f68 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
18730
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 1997 |
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
3 Free Software Foundation, Inc. |
277 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
277 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 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:
14178
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
277 | 21 |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
23 #include <config.h> |
277 | 24 #include <stdio.h> |
25 /*#include <ctype.h>*/ | |
26 #undef NULL | |
27 #include "lisp.h" | |
769 | 28 #include "frame.h" |
277 | 29 #include "window.h" |
30 #include "termchar.h" | |
31 #include "dispextern.h" | |
32 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
33 #include "charset.h" |
277 | 34 #include "indent.h" |
35 #include "commands.h" | |
36 #include "macros.h" | |
37 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
38 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
39 #include "intervals.h" |
12081 | 40 #include "keyboard.h" |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
41 #include "coding.h" |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
42 #include "process.h" |
277 | 43 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
44 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
45 extern void set_frame_menubar (); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
46 extern int pending_menu_activation; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
47 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
48 |
277 | 49 extern int interrupt_input; |
50 extern int command_loop_level; | |
51 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
52 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
53 |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
54 extern Lisp_Object Qface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
55 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
56 extern Lisp_Object Voverriding_local_map; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
57 extern Lisp_Object Voverriding_local_map_menu_flag; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
58 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
59 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
60 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
61 Lisp_Object Qredisplay_end_trigger_functions; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
62 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
63 /* Nonzero means print newline to stdout before next minibuffer message. */ |
277 | 64 |
65 int noninteractive_need_newline; | |
66 | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
67 /* Nonzero means print newline to message log before next message. */ |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
68 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
69 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
70 |
277 | 71 #define min(a, b) ((a) < (b) ? (a) : (b)) |
72 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
11810 | 73 #define minmax(floor, val, ceil) \ |
74 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val)) | |
277 | 75 |
76 /* The buffer position of the first character appearing | |
769 | 77 entirely or partially on the current frame line. |
78 Or zero, which disables the optimization for the current frame line. */ | |
277 | 79 static int this_line_bufpos; |
80 | |
81 /* Number of characters past the end of this line, | |
82 including the terminating newline */ | |
83 static int this_line_endpos; | |
84 | |
769 | 85 /* The vertical position of this frame line. */ |
277 | 86 static int this_line_vpos; |
87 | |
769 | 88 /* Hpos value for start of display on this frame line. |
277 | 89 Usually zero, but negative if first character really began |
90 on previous line */ | |
91 static int this_line_start_hpos; | |
92 | |
93 /* Buffer that this_line variables are describing. */ | |
94 static struct buffer *this_line_buffer; | |
95 | |
96 /* Value of echo_area_glyphs when it was last acted on. | |
769 | 97 If this is nonzero, there is a message on the frame |
277 | 98 in the minibuffer and it should be erased as soon |
99 as it is no longer requested to appear. */ | |
100 char *previous_echo_glyphs; | |
101 | |
769 | 102 /* Nonzero means truncate lines in all windows less wide than the frame */ |
277 | 103 int truncate_partial_width_windows; |
104 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
105 /* Nonzero means we have more than one non-minibuffer-only frame. |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
106 Not guaranteed to be accurate except while parsing frame-title-format. */ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
107 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
108 |
277 | 109 Lisp_Object Vglobal_mode_string; |
110 | |
111 /* Marker for where to display an arrow on top of the buffer text. */ | |
112 Lisp_Object Voverlay_arrow_position; | |
113 | |
114 /* String to display for the arrow. */ | |
115 Lisp_Object Voverlay_arrow_string; | |
116 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
117 /* Values of those variables at last redisplay. |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
118 However, if Voverlay_arrow_position is a marker, |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
119 last_arrow_position is its numerical position. */ |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
120 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
121 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
122 /* Like mode-line-format, but for the titlebar on a visible frame. */ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
123 Lisp_Object Vframe_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
124 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
125 /* Like mode-line-format, but for the titlebar on an iconified frame. */ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
126 Lisp_Object Vicon_title_format; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
127 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
128 /* List of functions to call when a window's size changes. These |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
129 functions get one arg, a frame on which one or more windows' sizes |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
130 have changed. */ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
131 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
132 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
133 Lisp_Object Qmenu_bar_update_hook; |
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
134 |
277 | 135 /* Nonzero if overlay arrow has been displayed once in this window. */ |
136 static int overlay_arrow_seen; | |
137 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
138 /* Nonzero if visible end of buffer has already been displayed once |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
139 in this window. (We need this variable in case there are overlay |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
140 strings that get displayed there.) */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
141 static int zv_strings_seen; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
142 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
143 /* Nonzero means highlight the region even in nonselected windows. */ |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
144 static int highlight_nonselected_windows; |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
145 |
769 | 146 /* If cursor motion alone moves point off frame, |
277 | 147 Try scrolling this many lines up or down if that will bring it back. */ |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
148 static int scroll_step; |
277 | 149 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
150 /* Non-0 means scroll just far enough to bring point back on the screen, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
151 when appropriate. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
152 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
153 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
154 /* Recenter the window whenever point gets within this many lines |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
155 of the top or bottom of the window. */ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
156 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
157 |
277 | 158 /* Nonzero if try_window_id has made blank lines at window bottom |
159 since the last redisplay that paused */ | |
160 static int blank_end_of_window; | |
161 | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
162 /* Number of windows showing the buffer of the selected window |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
163 (or another buffer with the same base buffer). |
277 | 164 keyboard.c refers to this. */ |
165 int buffer_shared; | |
166 | |
769 | 167 /* display_text_line sets these to the frame position (origin 0) of point, |
277 | 168 whether the window is selected or not. |
169 Set one to -1 first to determine whether point was found afterwards. */ | |
170 | |
171 static int cursor_vpos; | |
172 static int cursor_hpos; | |
173 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
174 static int debug_end_pos; |
277 | 175 |
176 /* Nonzero means display mode line highlighted */ | |
177 int mode_line_inverse_video; | |
178 | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
179 static void redisplay_internal (); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
180 static int message_log_check_duplicate (); |
277 | 181 static void echo_area_display (); |
182 void mark_window_display_accurate (); | |
183 static void redisplay_windows (); | |
184 static void redisplay_window (); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
185 static void update_menu_bar (); |
277 | 186 static void try_window (); |
187 static int try_window_id (); | |
188 static struct position *display_text_line (); | |
189 static void display_mode_line (); | |
190 static int display_mode_element (); | |
191 static char *decode_mode_spec (); | |
192 static int display_string (); | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
193 static void display_menu_bar (); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
194 static int display_count_lines (); |
277 | 195 |
196 /* Prompt to display in front of the minibuffer contents */ | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
197 Lisp_Object minibuf_prompt; |
277 | 198 |
199 /* Width in columns of current minibuffer prompt. */ | |
200 int minibuf_prompt_width; | |
201 | |
202 /* Message to display instead of minibuffer contents | |
203 This is what the functions error and message make, | |
204 and command echoing uses it as well. | |
205 It overrides the minibuf_prompt as well as the buffer. */ | |
206 char *echo_area_glyphs; | |
207 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
208 /* This is the length of the message in echo_area_glyphs. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
209 int echo_area_glyphs_length; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
210 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
211 /* This is the window where the echo area message was displayed. |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
212 It is always a minibuffer window, but it may not be the |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
213 same window currently active as a minibuffer. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
214 Lisp_Object echo_area_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
215 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
216 /* Nonzero means multibyte characters were enabled when the echo area |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
217 message was specified. */ |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
218 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
219 |
277 | 220 /* true iff we should redraw the mode lines on the next redisplay */ |
221 int update_mode_lines; | |
222 | |
223 /* Smallest number of characters before the gap | |
224 at any time since last redisplay that finished. | |
225 Valid for current buffer when try_window_id can be called. */ | |
226 int beg_unchanged; | |
227 | |
228 /* Smallest number of characters after the gap | |
229 at any time since last redisplay that finished. | |
230 Valid for current buffer when try_window_id can be called. */ | |
231 int end_unchanged; | |
232 | |
233 /* MODIFF as of last redisplay that finished; | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
234 if it matches MODIFF, and overlay_unchanged_modified |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
235 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged |
277 | 236 contain no useful information */ |
237 int unchanged_modified; | |
238 | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
239 /* OVERLAY_MODIFF as of last redisplay that finished. */ |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
240 int overlay_unchanged_modified; |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
241 |
277 | 242 /* Nonzero if window sizes or contents have changed |
243 since last redisplay that finished */ | |
244 int windows_or_buffers_changed; | |
245 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
246 /* Nonzero after display_mode_line if %l was used |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
247 and it displayed a line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
248 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
249 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
250 /* Maximum buffer size for which to display line numbers. */ |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
251 static int line_number_display_limit; |
10393 | 252 |
253 /* Number of lines to keep in the message log buffer. | |
254 t means infinite. nil means don't log at all. */ | |
255 Lisp_Object Vmessage_log_max; | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
256 |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
257 #define COERCE_MARKER(X) \ |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
258 (MARKERP ((X)) ? Fmarker_position (X) : (X)) |
277 | 259 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
260 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
261 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
262 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
263 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
264 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
265 if (message_log_need_newline) |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
266 message_dolog ("", 0, 1); |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
267 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
268 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
269 |
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
270 /* Add a string to the message log, optionally terminated with a newline. |
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
271 This function calls low-level routines in order to bypass text property |
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
272 hooks, etc. which might not be safe to run. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
273 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
274 void |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
275 message_dolog (m, len, nlflag) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
276 char *m; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
277 int len, nlflag; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
278 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
279 if (!NILP (Vmessage_log_max)) |
10393 | 280 { |
281 struct buffer *oldbuf; | |
282 int oldpoint, oldbegv, oldzv; | |
13733
e51b69e60614
(message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents:
13655
diff
changeset
|
283 int old_windows_or_buffers_changed = windows_or_buffers_changed; |
10393 | 284 |
285 oldbuf = current_buffer; | |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
286 Fset_buffer (Fget_buffer_create (build_string ("*Messages*"))); |
11531
355c40d2b1d2
(message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents:
11499
diff
changeset
|
287 current_buffer->undo_list = Qt; |
10393 | 288 oldpoint = PT; |
289 oldbegv = BEGV; | |
290 oldzv = ZV; | |
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
291 BEGV = BEG; |
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
292 ZV = Z; |
10393 | 293 if (oldpoint == Z) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
294 oldpoint += len + nlflag; |
10393 | 295 if (oldzv == Z) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
296 oldzv += len + nlflag; |
10393 | 297 TEMP_SET_PT (Z); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
298 if (len) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
299 insert_1 (m, len, 1, 0); |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
300 if (nlflag) |
10393 | 301 { |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
302 int this_bol, prev_bol, dup; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
303 insert_1 ("\n", 1, 1, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
304 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
305 this_bol = scan_buffer ('\n', Z, 0, -2, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
306 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
307 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
308 prev_bol = scan_buffer ('\n', this_bol, 0, -2, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
309 dup = message_log_check_duplicate (prev_bol, this_bol); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
310 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
311 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
312 if (oldpoint > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
313 oldpoint -= min (this_bol, oldpoint) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
314 if (oldbegv > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
315 oldbegv -= min (this_bol, oldbegv) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
316 if (oldzv > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
317 oldzv -= min (this_bol, oldzv) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
318 del_range_1 (prev_bol, this_bol, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
319 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
320 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
321 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
322 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
323 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
324 /* If you change this format, don't forget to also |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
325 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
326 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
327 duplen = strlen (dupstr); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
328 TEMP_SET_PT (Z-1); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
329 if (oldpoint == Z) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
330 oldpoint += duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
331 if (oldzv == Z) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
332 oldzv += duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
333 insert_1 (dupstr, duplen, 1, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
334 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
335 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
336 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
337 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
338 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
339 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
340 int pos = scan_buffer ('\n', Z, 0, |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
341 -XFASTINT (Vmessage_log_max) - 1, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
342 oldpoint -= min (pos, oldpoint) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
343 oldbegv -= min (pos, oldbegv) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
344 oldzv -= min (pos, oldzv) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
345 del_range_1 (BEG, pos, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
346 } |
10393 | 347 } |
348 BEGV = oldbegv; | |
349 ZV = oldzv; | |
350 TEMP_SET_PT (oldpoint); | |
351 set_buffer_internal (oldbuf); | |
13733
e51b69e60614
(message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents:
13655
diff
changeset
|
352 windows_or_buffers_changed = old_windows_or_buffers_changed; |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
353 message_log_need_newline = !nlflag; |
10393 | 354 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
355 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
356 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
357 /* We are at the end of the buffer after just having inserted a newline. |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
358 (Note: We depend on the fact we won't be crossing the gap.) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
359 Check to see if the most recent message looks a lot like the previous one. |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
360 Return 0 if different, 1 if the new one should just replace it, or a |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
361 value N > 1 if we should also append " [N times]". */ |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
362 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
363 static int |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
364 message_log_check_duplicate (prev_bol, this_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
365 int prev_bol, this_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
366 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
367 int i; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
368 int len = Z - 1 - this_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
369 int seen_dots = 0; |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
370 unsigned char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
371 unsigned char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
372 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
373 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
374 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
375 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.' |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
376 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
377 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
378 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
379 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
380 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
381 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
382 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
383 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
384 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
385 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
386 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
387 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
388 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
389 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
390 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
391 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
392 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
393 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
394 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
395 /* Display an echo area message M with a specified length of LEN chars. |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
396 The string may include null characters. If M is 0, clear out any |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
397 existing message, and let the minibuffer text show through. |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
398 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
399 The buffer M must continue to exist until after the echo area |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
400 gets cleared or some other message gets displayed there. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
401 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
402 Do not pass text that is stored in a Lisp string. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
403 Do not pass text in a buffer that was alloca'd. */ |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
404 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
405 void |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
406 message2 (m, len) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
407 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
408 int len; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
409 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
410 /* First flush out any partial line written with print. */ |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
411 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
412 if (m) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
413 message_dolog (m, len, 1); |
10393 | 414 message2_nolog (m, len); |
415 } | |
416 | |
417 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
418 /* The non-logging counterpart of message2. */ |
10393 | 419 |
420 void | |
421 message2_nolog (m, len) | |
422 char *m; | |
423 int len; | |
424 { | |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
425 message_enable_multibyte |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
426 = ! NILP (current_buffer->enable_multibyte_characters); |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
427 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
428 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
429 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
430 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
431 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
432 noninteractive_need_newline = 0; |
18752
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
433 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
434 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
435 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
436 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
437 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
438 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
439 /* A null message buffer means that the frame hasn't really been |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
440 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
441 cmd_error, so this must be just an informative message; toss it. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
442 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
443 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
444 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
445 FRAME_PTR f; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
446 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
447 /* Get the frame containing the minibuffer |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
448 that the selected frame is using. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
449 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
450 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
451 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
452 FRAME_SAMPLE_VISIBILITY (f); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
453 if (FRAME_VISIBLE_P (selected_frame) |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
454 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
455 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
456 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
457 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
458 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
459 echo_area_glyphs = m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
460 echo_area_glyphs_length = len; |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
461 |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
462 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
463 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
464 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
465 else |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
466 echo_area_glyphs = previous_echo_glyphs = 0; |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
467 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
468 do_pending_window_change (); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
469 echo_area_display (); |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
470 update_frame (f, 1, 1); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
471 do_pending_window_change (); |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
472 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
473 (*frame_up_to_date_hook) (f); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
474 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
475 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
476 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
477 /* Display a null-terminated echo area message M. If M is 0, clear out any |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
478 existing message, and let the minibuffer text show through. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
479 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
480 The buffer M must continue to exist until after the echo area |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
481 gets cleared or some other message gets displayed there. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
482 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
483 Do not pass text that is stored in a Lisp string. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
484 Do not pass text in a buffer that was alloca'd. */ |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
485 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
486 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
487 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
488 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
489 { |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
490 message2 (m, (m ? strlen (m) : 0)); |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
491 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
492 |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
493 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
494 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
495 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
496 { |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
497 message2_nolog (m, (m ? strlen (m) : 0)); |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
498 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
499 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
500 /* Truncate what will be displayed in the echo area |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
501 the next time we display it--but don't redisplay it now. */ |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
502 |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
503 void |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
504 truncate_echo_area (len) |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
505 int len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
506 { |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
507 /* A null message buffer means that the frame hasn't really been |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
508 initialized yet. Error messages get reported properly by |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
509 cmd_error, so this must be just an informative message; toss it. */ |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
510 if (!noninteractive && INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
511 echo_area_glyphs_length = len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
512 } |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
513 |
769 | 514 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print; |
331 | 515 zero if being used by message. */ |
516 int message_buf_print; | |
517 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
518 /* Dump an informative message to the minibuf. If M is 0, clear out |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
519 any existing message, and let the minibuffer text show through. */ |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
520 |
277 | 521 /* VARARGS 1 */ |
522 void | |
523 message (m, a1, a2, a3) | |
524 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
525 EMACS_INT a1, a2, a3; |
277 | 526 { |
527 if (noninteractive) | |
528 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
529 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
530 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
531 if (noninteractive_need_newline) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
532 putc ('\n', stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
533 noninteractive_need_newline = 0; |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
534 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
535 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
536 fprintf (stderr, "\n"); |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
537 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
538 } |
277 | 539 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
540 else if (INTERACTIVE) |
277 | 541 { |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
542 /* The frame whose minibuffer we're going to display the message on. |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
543 It may be larger than the selected frame, so we need |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
544 to use its buffer, not the selected frame's buffer. */ |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
545 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
546 FRAME_PTR f; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
547 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
548 /* Get the frame containing the minibuffer |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
549 that the selected frame is using. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
550 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
551 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 552 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
553 /* A null message buffer means that the frame hasn't really been |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
554 initialized yet. Error messages get reported properly by |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
555 cmd_error, so this must be just an informative message; toss it. */ |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
556 if (FRAME_MESSAGE_BUF (f)) |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
557 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
558 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
559 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
560 int len; |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
561 #ifdef NO_ARG_ARRAY |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
562 EMACS_INT a[3]; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
563 a[0] = a1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
564 a[1] = a2; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
565 a[2] = a3; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
566 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
567 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
568 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
569 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
570 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
571 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, &a1); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
572 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
573 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
574 message2 (FRAME_MESSAGE_BUF (f), len); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
575 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
576 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
577 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
578 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
579 /* Print should start at the beginning of the message |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
580 buffer next time. */ |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
581 message_buf_print = 0; |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
582 } |
277 | 583 } |
584 } | |
585 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
586 /* The non-logging version of message. */ |
11193 | 587 void |
588 message_nolog (m, a1, a2, a3) | |
589 char *m; | |
590 EMACS_INT a1, a2, a3; | |
591 { | |
592 Lisp_Object old_log_max; | |
593 old_log_max = Vmessage_log_max; | |
594 Vmessage_log_max = Qnil; | |
595 message (m, a1, a2, a3); | |
596 Vmessage_log_max = old_log_max; | |
597 } | |
598 | |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
599 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
600 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
601 { |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
602 message2 (echo_area_glyphs, echo_area_glyphs_length); |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
603 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
604 |
277 | 605 static void |
606 echo_area_display () | |
607 { | |
608 register int vpos; | |
769 | 609 FRAME_PTR f; |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
610 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
611 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
612 /* Choose the minibuffer window for this display. |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
613 It is the minibuffer window used by the selected frame. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
614 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
615 /* This is the frame that window is in. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
616 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 617 |
769 | 618 if (! FRAME_VISIBLE_P (f)) |
277 | 619 return; |
620 | |
769 | 621 if (frame_garbaged) |
277 | 622 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
623 redraw_garbaged_frames (); |
769 | 624 frame_garbaged = 0; |
277 | 625 } |
626 | |
627 if (echo_area_glyphs || minibuf_level == 0) | |
628 { | |
16266
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
629 int i; |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
630 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
631 echo_area_window = mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
632 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
633 vpos = XFASTINT (XWINDOW (mini_window)->top); |
769 | 634 get_display_line (f, vpos, 0); |
16266
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
635 |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
636 /* Make sure the columns that overlap a left-hand scroll bar |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
637 are always clear. */ |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
638 for (i = 0; i < FRAME_LEFT_SCROLL_BAR_WIDTH (f); i++) |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
639 f->desired_glyphs->glyphs[vpos][i] = SPACEGLYPH; |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
640 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
641 display_string (XWINDOW (mini_window), vpos, |
277 | 642 echo_area_glyphs ? echo_area_glyphs : "", |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
643 echo_area_glyphs ? echo_area_glyphs_length : -1, |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
644 FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
645 0, 0, 0, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
646 FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
647 message_enable_multibyte); |
277 | 648 |
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
649 #if 0 /* This just gets in the way. update_frame does the job. */ |
277 | 650 /* If desired cursor location is on this line, put it at end of text */ |
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
651 if (cursor_in_echo_area) |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
652 FRAME_CURSOR_Y (f) = vpos; |
769 | 653 if (FRAME_CURSOR_Y (f) == vpos) |
654 FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; | |
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
655 #endif |
727 | 656 |
657 /* Fill the rest of the minibuffer window with blank lines. */ | |
658 { | |
659 int i; | |
660 | |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
661 for (i = vpos + 1; |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
662 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++) |
727 | 663 { |
769 | 664 get_display_line (f, i, 0); |
18718
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
665 /* We don't use FRAME_SCROLL_BAR_WIDTH (f) as the starting |
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
666 hpos, because it is good to clear whatever is behind the |
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
667 scroll bar. This does not affect the scroll bar itself. */ |
18653
2c1f73252c1c
(echo_area_display): Use proper vpos when clearing extra minibuf lines.
Richard M. Stallman <rms@gnu.org>
parents:
18652
diff
changeset
|
668 display_string (XWINDOW (mini_window), i, |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
669 "", 0, |
18718
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
670 0, 0, 0, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
671 0, FRAME_WIDTH (f) + FRAME_SCROLL_BAR_WIDTH (f), |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
672 0); |
727 | 673 } |
674 } | |
277 | 675 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
676 else if (!EQ (mini_window, selected_window)) |
277 | 677 windows_or_buffers_changed++; |
678 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
679 if (EQ (mini_window, selected_window)) |
277 | 680 this_line_bufpos = 0; |
681 | |
682 previous_echo_glyphs = echo_area_glyphs; | |
683 } | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
684 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
685 /* Update frame titles. */ |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
686 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
687 #ifdef HAVE_WINDOW_SYSTEM |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
688 static char frame_title_buf[512]; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
689 static char *frame_title_ptr; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
690 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
691 static int |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
692 store_frame_title (str, mincol, maxcol) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
693 char *str; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
694 int mincol, maxcol; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
695 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
696 char *limit; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
697 if (maxcol < 0 || maxcol >= sizeof(frame_title_buf)) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
698 maxcol = sizeof (frame_title_buf); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
699 limit = &frame_title_buf[maxcol]; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
700 while (*str != '\0' && frame_title_ptr < limit) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
701 *frame_title_ptr++ = *str++; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
702 while (frame_title_ptr < &frame_title_buf[mincol]) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
703 *frame_title_ptr++ = ' '; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
704 return frame_title_ptr - frame_title_buf; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
705 } |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
706 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
707 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
708 x_consider_frame_title (frame) |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
709 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
710 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
711 Lisp_Object fmt; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
712 struct buffer *obuf; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
713 int len; |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
714 FRAME_PTR f = XFRAME (frame); |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
715 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
716 if (!(FRAME_WINDOW_P (f) || FRAME_MINIBUF_ONLY_P (f) || f->explicit_name)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
717 return; |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
718 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
719 /* Do we have more than one visible frame on this X display? */ |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
720 { |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
721 Lisp_Object tail; |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
722 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
723 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
724 { |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
725 FRAME_PTR tf = XFRAME (XCONS (tail)->car); |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
726 |
11948
19ebc17d1288
(x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents:
11920
diff
changeset
|
727 if (tf != f && FRAME_KBOARD (tf) == FRAME_KBOARD (f) |
19ebc17d1288
(x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents:
11920
diff
changeset
|
728 && !FRAME_MINIBUF_ONLY_P (tf) |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
729 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
730 break; |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
731 } |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
732 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
733 multiple_frames = CONSP (tail); |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
734 } |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
735 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
736 obuf = current_buffer; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
737 Fset_buffer (XWINDOW (f->selected_window)->buffer); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
738 fmt = (FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
739 frame_title_ptr = frame_title_buf; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
740 len = display_mode_element (XWINDOW (f->selected_window), 0, 0, 0, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
741 0, sizeof (frame_title_buf), fmt); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
742 frame_title_ptr = 0; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
743 set_buffer_internal (obuf); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
744 /* Set the name only if it's changed. This avoids consing |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
745 in the common case where it hasn't. (If it turns out that we've |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
746 already wasted too much time by walking through the list with |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
747 display_mode_element, then we might need to optimize at a higher |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
748 level than this.) */ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
749 if (! STRINGP (f->name) || XSTRING (f->name)->size != len |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
750 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
751 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
752 } |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
753 #else |
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
754 #define frame_title_ptr ((char *)0) |
8918
1be99ca9da45
[!HAVE_X_WINDOWS] (store_frame_title): Dummy macro.
Karl Heuer <kwzh@gnu.org>
parents:
8834
diff
changeset
|
755 #define store_frame_title(str, mincol, maxcol) 0 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
756 #endif |
277 | 757 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
758 /* Prepare for redisplay by updating menu-bar item lists when appropriate. |
11499 | 759 This can call eval. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
760 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
761 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
762 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
763 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
764 register struct window *w = XWINDOW (selected_window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
765 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
766 struct gcpro gcpro1, gcpro2; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
767 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
768 all_windows = (update_mode_lines || buffer_shared > 1 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
769 || windows_or_buffers_changed); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
770 |
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
771 /* Update all frame titles based on their buffer names, etc. |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
772 We do this before the menu bars so that the buffer-menu |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
773 will show the up-to-date frame titles. |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
774 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
775 This used to be done after the menu bars, for a reason that |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
776 was stated as follows but which I do not understand: |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
777 "We do this after the menu bars so that the frame will first |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
778 create its menu bar using the name `emacs' if no other name |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
779 has yet been specified." |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
780 I think that is no longer a concern. */ |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
781 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
782 if (windows_or_buffers_changed || update_mode_lines) |
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
783 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
784 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
785 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
786 FOR_EACH_FRAME (tail, frame) |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
787 if (FRAME_VISIBLE_P (XFRAME (frame)) |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
788 || FRAME_ICONIFIED_P (XFRAME (frame))) |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
789 x_consider_frame_title (frame); |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
790 } |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
791 #endif |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
792 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
793 /* Update the menu bar item lists, if appropriate. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
794 This has to be done before any actual redisplay |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
795 or generation of display lines. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
796 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
797 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
798 Lisp_Object tail, frame; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
799 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
800 |
16738
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
801 record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil)); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
802 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
803 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
804 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
805 /* If a window on this frame changed size, |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
806 report that to the user and clear the size-change flag. */ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
807 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame))) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
808 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
809 Lisp_Object functions; |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
810 /* Clear flag first in case we get error below. */ |
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
811 FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)) = 0; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
812 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
813 GCPRO2 (tail, functions); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
814 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
815 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
816 call1 (XCONS (functions)->car, frame); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
817 functions = XCONS (functions)->cdr; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
818 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
819 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
820 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
821 GCPRO1 (tail); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
822 update_menu_bar (XFRAME (frame), 0); |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
823 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
824 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
825 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
826 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
827 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
828 else |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
829 update_menu_bar (selected_frame, 1); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
830 |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
831 /* Motif needs this. See comment in xmenu.c. |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
832 Turn it off when pending_menu_activation is not defined. */ |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
833 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
834 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
835 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
836 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
837 |
769 | 838 /* Do a frame update, taking possible shortcuts into account. |
277 | 839 This is the main external entry point for redisplay. |
840 | |
841 If the last redisplay displayed an echo area message and that | |
842 message is no longer requested, we clear the echo area | |
843 or bring back the minibuffer if that is in use. | |
844 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
845 Do not call eval from within this function. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
846 Calls to eval after the call to echo_area_display would confuse |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
847 the display_line mechanism and would cause a crash. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
848 Calls to eval before that point will work most of the time, |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
849 but can still lose, because this function |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
850 can be called from signal handlers; with alarms set up; |
277 | 851 or with synchronous processes running. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
852 |
277 | 853 See Fcall_process; if you called it from here, it could be |
854 entered recursively. */ | |
855 | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
856 static int do_verify_charstarts; |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
857 |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
858 /* Counter is used to clear the face cache |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
859 no more than once ever 1000 redisplays. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
860 static int clear_face_cache_count; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
861 |
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
862 /* Record the previous terminal frame we displayed. */ |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
863 static FRAME_PTR previous_terminal_frame; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
864 |
277 | 865 void |
866 redisplay () | |
867 { | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
868 redisplay_internal (0); |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
869 } |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
870 |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
871 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
872 is not in response to any user action; therefore, we should |
14683 | 873 preserve the echo area. (Actually, our caller does that job.) |
874 Perhaps in the future avoid recentering windows | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
875 if it is not necessary; currently that causes some problems. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
876 |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
877 static void |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
878 redisplay_internal (preserve_echo_area) |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
879 int preserve_echo_area; |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
880 { |
277 | 881 register struct window *w = XWINDOW (selected_window); |
882 register int pause; | |
883 int must_finish = 0; | |
884 int all_windows; | |
885 register int tlbufpos, tlendpos; | |
886 struct position pos; | |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
887 int number_of_visible_frames; |
277 | 888 |
889 if (noninteractive) | |
890 return; | |
891 | |
14559
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
892 #ifdef USE_X_TOOLKIT |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
893 if (popup_activated ()) |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
894 return; |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
895 #endif |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
896 |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
897 retry: |
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
898 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
899 if (! FRAME_WINDOW_P (selected_frame) |
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
900 && previous_terminal_frame != selected_frame) |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
901 { |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
902 /* Since frames on an ASCII terminal share the same display area, |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
903 displaying a different frame means redisplay the whole thing. */ |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
904 windows_or_buffers_changed++; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
905 SET_FRAME_GARBAGED (selected_frame); |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
906 XSETFRAME (Vterminal_frame, selected_frame); |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
907 } |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
908 previous_terminal_frame = selected_frame; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
909 |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
910 /* Set the visible flags for all frames. |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
911 Do this before checking for resized or garbaged frames; they want |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
912 to know if their frames are visible. |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
913 See the comment in frame.h for FRAME_SAMPLE_VISIBILITY. */ |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
914 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
915 Lisp_Object tail, frame; |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
916 |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
917 number_of_visible_frames = 0; |
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
918 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
919 FOR_EACH_FRAME (tail, frame) |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
920 { |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
921 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
922 |
19197
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
923 if (FRAME_VISIBLE_P (XFRAME (frame))) |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
924 number_of_visible_frames++; |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
925 |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
926 /* Clear out all the display lines in which we will generate the |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
927 glyphs to display. */ |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
928 init_desired_glyphs (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
929 } |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
930 } |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
931 |
769 | 932 /* Notice any pending interrupt request to change frame size. */ |
277 | 933 do_pending_window_change (); |
934 | |
769 | 935 if (frame_garbaged) |
277 | 936 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
937 redraw_garbaged_frames (); |
769 | 938 frame_garbaged = 0; |
277 | 939 } |
940 | |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
941 prepare_menu_bars (); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
942 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
943 if (windows_or_buffers_changed) |
277 | 944 update_mode_lines++; |
945 | |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
946 /* Detect case that we need to write or remove a star in the mode line. */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
947 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) |
277 | 948 { |
949 w->update_mode_line = Qt; | |
950 if (buffer_shared > 1) | |
951 update_mode_lines++; | |
952 } | |
953 | |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
954 /* If %c is in use, update it if needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
955 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
956 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
957 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
958 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
959 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
960 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
961 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
962 w->update_mode_line = Qt; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
963 |
769 | 964 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; |
277 | 965 |
966 all_windows = update_mode_lines || buffer_shared > 1; | |
967 | |
968 /* If specs for an arrow have changed, do thorough redisplay | |
969 to ensure we remove any arrow that should no longer exist. */ | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
970 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
971 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
972 all_windows = 1; |
277 | 973 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
974 /* Normally the message* functions will have already displayed and |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
975 updated the echo area, but the frame may have been trashed, or |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
976 the update may have been preempted, so display the echo area |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
977 again here. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
978 if (echo_area_glyphs || previous_echo_glyphs) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
979 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
980 echo_area_display (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
981 must_finish = 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
982 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
983 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
984 /* If showing region, and mark has changed, must redisplay whole window. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
985 if (((!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
986 && !NILP (XBUFFER (w->buffer)->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
987 != !NILP (w->region_showing)) |
3937
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
988 || (!NILP (w->region_showing) |
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
989 && !EQ (w->region_showing, |
adcbf7680a35
* xdisp.c (redisplay): If we're not already showing the region,
Jim Blandy <jimb@redhat.com>
parents:
3880
diff
changeset
|
990 Fmarker_position (XBUFFER (w->buffer)->mark)))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
991 this_line_bufpos = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
992 |
277 | 993 tlbufpos = this_line_bufpos; |
994 tlendpos = this_line_endpos; | |
485 | 995 if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line) |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
996 && !current_buffer->clip_changed |
769 | 997 && FRAME_VISIBLE_P (XFRAME (w->frame)) |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
998 && !FRAME_OBSCURED_P (XFRAME (w->frame)) |
277 | 999 /* Make sure recorded data applies to current buffer, etc */ |
1000 && this_line_buffer == current_buffer | |
1001 && current_buffer == XBUFFER (w->buffer) | |
485 | 1002 && NILP (w->force_start) |
277 | 1003 /* Point must be on the line that we have info recorded about */ |
6705 | 1004 && PT >= tlbufpos |
1005 && PT <= Z - tlendpos | |
277 | 1006 /* All text outside that line, including its final newline, |
1007 must be unchanged */ | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1008 && ((XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1009 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)) |
277 | 1010 || (beg_unchanged >= tlbufpos - 1 |
1011 && GPT >= tlbufpos | |
528 | 1012 /* If selective display, can't optimize |
1013 if the changes start at the beginning of the line. */ | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1014 && ((INTEGERP (current_buffer->selective_display) |
528 | 1015 && XINT (current_buffer->selective_display) > 0 |
1016 ? (beg_unchanged >= tlbufpos | |
1017 && GPT > tlbufpos) | |
1018 : 1)) | |
277 | 1019 && end_unchanged >= tlendpos |
1020 && Z - GPT >= tlendpos))) | |
1021 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1022 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos - 1) != '\n' |
277 | 1023 && (tlbufpos == ZV |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1024 || FETCH_BYTE (tlbufpos) == '\n')) |
277 | 1025 /* Former continuation line has disappeared by becoming empty */ |
1026 goto cancel; | |
1027 else if (XFASTINT (w->last_modified) < MODIFF | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1028 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF |
277 | 1029 || MINI_WINDOW_P (w)) |
1030 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1031 /* We have to handle the case of continuation around a |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1032 wide-column character (See the comment in indent.c around |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1033 line 885). |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1034 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1035 For instance, in the following case: |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1036 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1037 -------- Insert -------- |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1038 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1039 J_I_ ==> J_I_ `^^' are cursors. |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1040 ^^ ^^ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1041 -------- -------- |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1042 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1043 As we have to redraw the line above, we should goto cancel. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1044 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1045 struct position val; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1046 int prevline; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1047 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1048 prevline = find_next_newline (tlbufpos, -1); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1049 val = *compute_motion (prevline, 0, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1050 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1051 0, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1052 tlbufpos, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1053 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1054 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1055 window_internal_width (w) - 1, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1056 XINT (w->hscroll), 0, w); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1057 if (val.hpos != this_line_start_hpos) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1058 goto cancel; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1059 |
277 | 1060 cursor_vpos = -1; |
1061 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1062 zv_strings_seen = 0; |
277 | 1063 display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos, |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
1064 pos_tab_offset (w, tlbufpos), 0); |
277 | 1065 /* If line contains point, is not continued, |
1066 and ends at same distance from eob as before, we win */ | |
1067 if (cursor_vpos >= 0 && this_line_bufpos | |
1068 && this_line_endpos == tlendpos) | |
1069 { | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1070 /* If this is not the window's last line, |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1071 we must adjust the charstarts of the lines below. */ |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1072 if (this_line_vpos + 1 |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1073 < XFASTINT (w->top) + window_internal_height (w)) |
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1074 { |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1075 int left = WINDOW_LEFT_MARGIN (w); |
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1076 int *charstart_next_line |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1077 = FRAME_CURRENT_GLYPHS (XFRAME (WINDOW_FRAME (w)))->charstarts[this_line_vpos + 1]; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1078 int adjust; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1079 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1080 if (Z - tlendpos == ZV) |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1081 /* This line ends at end of (accessible part of) buffer. |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1082 There is no newline to count. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1083 adjust = Z - tlendpos - charstart_next_line[left]; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1084 else |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1085 /* This line ends in a newline. |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1086 Must take account of the newline and the rest of the |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1087 text that follows. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1088 adjust = Z - tlendpos + 1 - charstart_next_line[left]; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1089 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1090 adjust_window_charstarts (w, this_line_vpos, adjust); |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1091 } |
6619
b3631c88ec7e
(redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents:
6612
diff
changeset
|
1092 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1093 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1094 preserve_other_columns (w); |
1095 goto update; | |
1096 } | |
1097 else | |
1098 goto cancel; | |
1099 } | |
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1100 else if (PT == XFASTINT (w->last_point) |
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1101 /* Make sure the cursor was last displayed |
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1102 in this window. Otherwise we have to reposition it. */ |
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1103 && XINT (w->top) <= FRAME_CURSOR_Y (selected_frame) |
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1104 && (XINT (w->top) + XINT (w->height) |
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1105 > FRAME_CURSOR_Y (selected_frame))) |
277 | 1106 { |
1107 if (!must_finish) | |
1108 { | |
1109 do_pending_window_change (); | |
1110 return; | |
1111 } | |
1112 goto update; | |
1113 } | |
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1114 /* If highlighting the region, or if the cursor is in the echo area, |
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1115 then we can't just move the cursor. */ |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1116 else if (! (!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1117 && !NILP (current_buffer->mark_active)) |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1118 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1119 || highlight_nonselected_windows) |
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1120 && NILP (w->region_showing) |
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1121 && !cursor_in_echo_area) |
277 | 1122 { |
1123 pos = *compute_motion (tlbufpos, 0, | |
1124 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1125 0, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
1126 PT, 2, - (1 << (BITS_PER_SHORT - 1)), |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1127 window_internal_width (w) - 1, |
574 | 1128 XINT (w->hscroll), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1129 pos_tab_offset (w, tlbufpos), w); |
277 | 1130 if (pos.vpos < 1) |
1131 { | |
11810 | 1132 int width = window_internal_width (w) - 1; |
769 | 1133 FRAME_CURSOR_X (selected_frame) |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1134 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width); |
769 | 1135 FRAME_CURSOR_Y (selected_frame) = this_line_vpos; |
277 | 1136 goto update; |
1137 } | |
1138 else | |
1139 goto cancel; | |
1140 } | |
1141 cancel: | |
1142 /* Text changed drastically or point moved off of line */ | |
769 | 1143 cancel_line (this_line_vpos, selected_frame); |
277 | 1144 } |
1145 | |
1146 this_line_bufpos = 0; | |
1147 all_windows |= buffer_shared > 1; | |
1148 | |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1149 clear_face_cache_count++; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1150 |
277 | 1151 if (all_windows) |
1152 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1153 Lisp_Object tail, frame; |
277 | 1154 |
9572 | 1155 #ifdef HAVE_FACES |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1156 /* Clear the face cache, only when we do a full redisplay |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1157 and not too often either. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1158 if (clear_face_cache_count > 1000) |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1159 { |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1160 clear_face_cache (); |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1161 clear_face_cache_count = 0; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1162 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1163 #endif |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1164 |
277 | 1165 /* Recompute # windows showing selected buffer. |
433 | 1166 This will be incremented each time such a window is displayed. */ |
277 | 1167 buffer_shared = 0; |
1168 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1169 FOR_EACH_FRAME (tail, frame) |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1170 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1171 FRAME_PTR f = XFRAME (frame); |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1172 if (FRAME_WINDOW_P (f) || f == selected_frame) |
10769
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1173 { |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1174 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1175 /* Mark all the scroll bars to be removed; we'll redeem the ones |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1176 we want when we redisplay their windows. */ |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1177 if (condemn_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1178 (*condemn_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1179 |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1180 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1181 redisplay_windows (FRAME_ROOT_WINDOW (f), preserve_echo_area); |
10769
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1182 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1183 /* Any scroll bars which redisplay_windows should have nuked |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1184 should now go away. */ |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1185 if (judge_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1186 (*judge_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1187 } |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1188 } |
277 | 1189 } |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1190 else if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
277 | 1191 { |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1192 redisplay_window (selected_window, 1, preserve_echo_area); |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1193 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1194 preserve_other_columns (w); |
1195 } | |
1196 | |
1197 update: | |
1198 /* Prevent various kinds of signals during display update. | |
1199 stdio is not robust about handling signals, | |
1200 which can cause an apparent I/O error. */ | |
1201 if (interrupt_input) | |
1202 unrequest_sigio (); | |
1203 stop_polling (); | |
1204 | |
1205 if (all_windows) | |
1206 { | |
1207 Lisp_Object tail; | |
1208 | |
1209 pause = 0; | |
1210 | |
769 | 1211 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
277 | 1212 { |
769 | 1213 FRAME_PTR f; |
277 | 1214 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1215 if (!FRAMEP (XCONS (tail)->car)) |
277 | 1216 continue; |
1217 | |
769 | 1218 f = XFRAME (XCONS (tail)->car); |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
1219 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1220 if ((FRAME_WINDOW_P (f) || f == selected_frame) |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1221 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
277 | 1222 { |
769 | 1223 pause |= update_frame (f, 0, 0); |
277 | 1224 if (!pause) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1225 { |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1226 mark_window_display_accurate (f->root_window, 1); |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1227 if (frame_up_to_date_hook != 0) |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1228 (*frame_up_to_date_hook) (f); |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1229 } |
277 | 1230 } |
1231 } | |
1232 } | |
1233 else | |
368 | 1234 { |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1235 if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
769 | 1236 pause = update_frame (selected_frame, 0, 0); |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1237 else |
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1238 pause = 0; |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1239 |
433 | 1240 /* We may have called echo_area_display at the top of this |
769 | 1241 function. If the echo area is on another frame, that may |
1242 have put text on a frame other than the selected one, so the | |
1243 above call to update_frame would not have caught it. Catch | |
433 | 1244 it here. */ |
1245 { | |
12792
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1246 Lisp_Object mini_window; |
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1247 FRAME_PTR mini_frame; |
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1248 |
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1249 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1250 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
433 | 1251 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1252 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame)) |
769 | 1253 pause |= update_frame (mini_frame, 0, 0); |
433 | 1254 } |
368 | 1255 } |
277 | 1256 |
769 | 1257 /* If frame does not match, prevent doing single-line-update next time. |
277 | 1258 Also, don't forget to check every line to update the arrow. */ |
1259 if (pause) | |
1260 { | |
1261 this_line_bufpos = 0; | |
485 | 1262 if (!NILP (last_arrow_position)) |
277 | 1263 { |
1264 last_arrow_position = Qt; | |
1265 last_arrow_string = Qt; | |
1266 } | |
769 | 1267 /* If we pause after scrolling, some lines in current_frame |
277 | 1268 may be null, so preserve_other_columns won't be able to |
1269 preserve all the vertical-bar separators. So, avoid using it | |
1270 in that case. */ | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1271 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1272 update_mode_lines = 1; |
1273 } | |
1274 | |
769 | 1275 /* Now text on frame agrees with windows, so |
277 | 1276 put info into the windows for partial redisplay to follow */ |
1277 | |
1278 if (!pause) | |
1279 { | |
1280 register struct buffer *b = XBUFFER (w->buffer); | |
1281 | |
1282 blank_end_of_window = 0; | |
1283 unchanged_modified = BUF_MODIFF (b); | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1284 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b); |
277 | 1285 beg_unchanged = BUF_GPT (b) - BUF_BEG (b); |
1286 end_unchanged = BUF_Z (b) - BUF_GPT (b); | |
1287 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1288 XSETFASTINT (w->last_point, BUF_PT (b)); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1289 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (selected_frame)); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1290 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame)); |
277 | 1291 |
1292 if (all_windows) | |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
1293 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); |
277 | 1294 else |
1295 { | |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1296 b->clip_changed = 0; |
277 | 1297 w->update_mode_line = Qnil; |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1298 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1299 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1300 w->last_had_star |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1301 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1302 ? Qt : Qnil); |
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1303 |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1304 /* Record if we are showing a region, so can make sure to |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1305 update it fully at next redisplay. */ |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1306 w->region_showing = (!NILP (Vtransient_mark_mode) |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1307 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1308 || highlight_nonselected_windows) |
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1309 && !NILP (XBUFFER (w->buffer)->mark_active) |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1310 ? Fmarker_position (XBUFFER (w->buffer)->mark) |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1311 : Qnil); |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1312 |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1313 w->window_end_valid = w->buffer; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1314 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
277 | 1315 last_arrow_string = Voverlay_arrow_string; |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1316 if (do_verify_charstarts) |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1317 verify_charstarts (w); |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1318 if (frame_up_to_date_hook != 0) |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1319 (*frame_up_to_date_hook) (selected_frame); |
277 | 1320 } |
1321 update_mode_lines = 0; | |
1322 windows_or_buffers_changed = 0; | |
1323 } | |
1324 | |
1325 /* Start SIGIO interrupts coming again. | |
1326 Having them off during the code above | |
1327 makes it less likely one will discard output, | |
1328 but not impossible, since there might be stuff | |
1329 in the system buffer here. | |
1330 But it is much hairier to try to do anything about that. */ | |
1331 | |
1332 if (interrupt_input) | |
1333 request_sigio (); | |
1334 start_polling (); | |
1335 | |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1336 /* If something has become visible now which was not before, |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1337 redisplay again, so that we get them. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1338 if (!pause) |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1339 { |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1340 Lisp_Object tail, frame; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1341 int new_count = 0; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1342 |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1343 FOR_EACH_FRAME (tail, frame) |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1344 { |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1345 int this_is_visible = 0; |
19197
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1346 |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1347 if (XFRAME (frame)->visible) |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1348 this_is_visible = 1; |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1349 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1350 if (XFRAME (frame)->visible) |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1351 this_is_visible = 1; |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1352 |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1353 if (this_is_visible) |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1354 new_count++; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1355 } |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1356 |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1357 if (new_count != number_of_visible_frames) |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1358 windows_or_buffers_changed++; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1359 } |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1360 |
769 | 1361 /* Change frame size now if a change is pending. */ |
277 | 1362 do_pending_window_change (); |
7752
7b1a7e4c7694
(redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents:
7473
diff
changeset
|
1363 |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1364 /* If we just did a pending size change, or have additional |
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1365 visible frames, redisplay again. */ |
7757
8d27747de7ca
(redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents:
7752
diff
changeset
|
1366 if (windows_or_buffers_changed && !pause) |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1367 goto retry; |
277 | 1368 } |
1369 | |
1370 /* Redisplay, but leave alone any recent echo area message | |
1371 unless another message has been requested in its place. | |
1372 | |
1373 This is useful in situations where you need to redisplay but no | |
1374 user action has occurred, making it inappropriate for the message | |
1375 area to be cleared. See tracking_off and | |
1376 wait_reading_process_input for examples of these situations. */ | |
1377 | |
1378 redisplay_preserve_echo_area () | |
1379 { | |
1380 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0) | |
1381 { | |
1382 echo_area_glyphs = previous_echo_glyphs; | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1383 redisplay_internal (1); |
277 | 1384 echo_area_glyphs = 0; |
1385 } | |
1386 else | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1387 redisplay_internal (1); |
277 | 1388 } |
1389 | |
1390 void | |
1391 mark_window_display_accurate (window, flag) | |
1392 Lisp_Object window; | |
1393 int flag; | |
1394 { | |
1395 register struct window *w; | |
1396 | |
485 | 1397 for (;!NILP (window); window = w->next) |
277 | 1398 { |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1399 if (!WINDOWP (window)) abort (); |
277 | 1400 w = XWINDOW (window); |
1401 | |
485 | 1402 if (!NILP (w->buffer)) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1403 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1404 XSETFASTINT (w->last_modified, |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1405 !flag ? 0 : BUF_MODIFF (XBUFFER (w->buffer))); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1406 XSETFASTINT (w->last_overlay_modified, |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1407 !flag ? 0 : BUF_OVERLAY_MODIFF (XBUFFER (w->buffer))); |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1408 w->last_had_star |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1409 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1410 ? Qt : Qnil); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1411 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1412 /* Record if we are showing a region, so can make sure to |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1413 update it fully at next redisplay. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1414 w->region_showing = (!NILP (Vtransient_mark_mode) |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1415 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1416 || highlight_nonselected_windows) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1417 && !NILP (XBUFFER (w->buffer)->mark_active) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1418 ? Fmarker_position (XBUFFER (w->buffer)->mark) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1419 : Qnil); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1420 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1421 |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1422 w->window_end_valid = w->buffer; |
277 | 1423 w->update_mode_line = Qnil; |
14263
082e86e9bca3
(mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents:
14206
diff
changeset
|
1424 if (!NILP (w->buffer) && flag) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1425 XBUFFER (w->buffer)->clip_changed = 0; |
277 | 1426 |
485 | 1427 if (!NILP (w->vchild)) |
277 | 1428 mark_window_display_accurate (w->vchild, flag); |
485 | 1429 if (!NILP (w->hchild)) |
277 | 1430 mark_window_display_accurate (w->hchild, flag); |
1431 } | |
1432 | |
1433 if (flag) | |
1434 { | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1435 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
277 | 1436 last_arrow_string = Voverlay_arrow_string; |
1437 } | |
1438 else | |
1439 { | |
1440 /* t is unequal to any useful value of Voverlay_arrow_... */ | |
1441 last_arrow_position = Qt; | |
1442 last_arrow_string = Qt; | |
1443 } | |
1444 } | |
1445 | |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1446 /* Update the menu bar item list for frame F. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1447 This has to be done before we start to fill in any display lines, |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1448 because it can call eval. |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1449 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1450 If SAVE_MATCH_DATA is 1, we must save and restore it here. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1451 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1452 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1453 update_menu_bar (f, save_match_data) |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1454 FRAME_PTR f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1455 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1456 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1457 struct buffer *old = current_buffer; |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1458 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1459 register struct window *w; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1460 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1461 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1462 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1463 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1464 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1465 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1466 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
1467 if (FRAME_WINDOW_P (f) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1468 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
1469 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1470 FRAME_EXTERNAL_MENU_BAR (f) |
5676
b5027523c90d
Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5658
diff
changeset
|
1471 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1472 FRAME_MENU_BAR_LINES (f) > 0 |
5676
b5027523c90d
Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5658
diff
changeset
|
1473 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1474 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1475 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1476 /* If the user has switched buffers or windows, we need to |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1477 recompute to reflect the new bindings. But we'll |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1478 recompute when update_mode_lines is set too; that means |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1479 that people can use force-mode-line-update to request |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1480 that the menu bar be recomputed. The adverse effect on |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1481 the rest of the redisplay algorithm is about the same as |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1482 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1483 if (windows_or_buffers_changed |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1484 || !NILP (w->update_mode_line) |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1485 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1486 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1487 != !NILP (w->last_had_star)) |
12022
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1488 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1489 && !NILP (XBUFFER (w->buffer)->mark_active)) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1490 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1491 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1492 struct buffer *prev = current_buffer; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1493 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1494 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1495 set_buffer_internal_1 (XBUFFER (w->buffer)); |
12017
0d73575a1c0e
(update_menu_bar): Reverse test of save_match_data.
Karl Heuer <kwzh@gnu.org>
parents:
11971
diff
changeset
|
1496 if (save_match_data) |
16738
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
1497 record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil)); |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1498 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1499 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1500 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1501 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1502 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1503 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1504 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1505 call1 (Vrun_hooks, Qactivate_menubar_hook); |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1506 /* If it has changed current-menubar from previous value, |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1507 really recompute the menubar from the value. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1508 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1509 call0 (Qrecompute_lucid_menubar); |
14299 | 1510 safe_run_hooks (Qmenu_bar_update_hook); |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
1511 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1512 /* Redisplay the menu bar in case we changed it. */ |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
1513 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
1514 if (FRAME_WINDOW_P (f)) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1515 set_frame_menubar (f, 0, 0); |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1516 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1517 /* On a terminal screen, the menu bar is an ordinary screen |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1518 line, and this makes it get updated. */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1519 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1520 #else /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1521 /* In the non-toolkit version, the menu bar is an ordinary screen |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1522 line, and this makes it get updated. */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1523 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1524 #endif /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1525 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1526 unbind_to (count, Qnil); |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1527 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1528 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1529 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1530 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1531 |
277 | 1532 int do_id = 1; |
1533 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1534 /* Redisplay WINDOW and its subwindows and siblings. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1535 |
277 | 1536 static void |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1537 redisplay_windows (window, preserve_echo_area) |
277 | 1538 Lisp_Object window; |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1539 int preserve_echo_area; |
277 | 1540 { |
485 | 1541 for (; !NILP (window); window = XWINDOW (window)->next) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1542 redisplay_window (window, 0, preserve_echo_area); |
277 | 1543 } |
1544 | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1545 /* Return value in display table DP (Lisp_Char_Table *) for character |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1546 C. Since a display table doesn't have any parent, we don't have to |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1547 follow parent. Do not call this function directly but use the |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1548 macro DISP_CHAR_VECTOR. */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1549 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1550 disp_char_vector (dp, c) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1551 struct Lisp_Char_Table *dp; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1552 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1553 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1554 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1555 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1556 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1557 if (SINGLE_BYTE_CHAR_P (c)) return (dp->contents[c]); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1558 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1559 SPLIT_NON_ASCII_CHAR (c, code[0], code[1], code[2]); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1560 if (code[0] != CHARSET_COMPOSITION) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1561 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1562 if (code[1] < 32) code[1] = -1; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1563 else if (code[2] < 32) code[2] = -1; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1564 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1565 /* Here, the possible range of CODE[0] (== charset ID) is |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1566 128..MAX_CHARSET. Since the top level char table contains data |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1567 for multibyte characters after 256th element, we must increment |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1568 CODE[0] by 128 to get a correct index. */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1569 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1570 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1571 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1572 for (i = 0; code[i] >= 0; i++, dp = XCHAR_TABLE (val)) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1573 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1574 val = dp->contents[code[i]]; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1575 if (!SUB_CHAR_TABLE_P (val)) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1576 return (NILP (val) ? dp->defalt : val); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1577 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1578 /* Here, VAL is a sub char table. We return the default value of it. */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1579 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1580 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1581 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1582 /* Redisplay window WINDOW and its subwindows. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1583 |
277 | 1584 static void |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1585 redisplay_window (window, just_this_one, preserve_echo_area) |
277 | 1586 Lisp_Object window; |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1587 int just_this_one, preserve_echo_area; |
277 | 1588 { |
1589 register struct window *w = XWINDOW (window); | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1590 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 1591 int height; |
6705 | 1592 register int lpoint = PT; |
277 | 1593 struct buffer *old = current_buffer; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1594 register int width = window_internal_width (w) - 1; |
277 | 1595 register int startp; |
1596 register int hscroll = XINT (w->hscroll); | |
1597 struct position pos; | |
6705 | 1598 int opoint = PT; |
277 | 1599 int tem; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1600 int update_mode_line; |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1601 struct Lisp_Char_Table *dp = window_display_table (w); |
277 | 1602 |
769 | 1603 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
277 | 1604 |
1605 /* If this is a combination window, do its children; that's all. */ | |
1606 | |
485 | 1607 if (!NILP (w->vchild)) |
277 | 1608 { |
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1609 redisplay_windows (w->vchild, preserve_echo_area); |
277 | 1610 return; |
1611 } | |
485 | 1612 if (!NILP (w->hchild)) |
277 | 1613 { |
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1614 redisplay_windows (w->hchild, preserve_echo_area); |
277 | 1615 return; |
1616 } | |
485 | 1617 if (NILP (w->buffer)) |
277 | 1618 abort (); |
433 | 1619 |
1620 height = window_internal_height (w); | |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1621 update_mode_line = (!NILP (w->update_mode_line) || update_mode_lines); |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1622 if (XBUFFER (w->buffer)->clip_changed) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1623 update_mode_line = 1; |
433 | 1624 |
1625 if (MINI_WINDOW_P (w)) | |
1626 { | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1627 if (w == XWINDOW (echo_area_window) && echo_area_glyphs) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1628 /* We've already displayed the echo area glyphs in this window. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1629 goto finish_scroll_bars; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1630 else if (w != XWINDOW (minibuf_window)) |
433 | 1631 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1632 /* This is a minibuffer, but it's not the currently active one, |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1633 so clear it. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1634 int vpos = XFASTINT (w->top); |
433 | 1635 int i; |
1636 | |
1637 for (i = 0; i < height; i++) | |
1638 { | |
769 | 1639 get_display_line (f, vpos + i, 0); |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1640 display_string (w, vpos + i, "", 0, |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1641 FRAME_LEFT_SCROLL_BAR_WIDTH (f), |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
1642 0, 1, 0, width, 0); |
433 | 1643 } |
1644 | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1645 goto finish_scroll_bars; |
433 | 1646 } |
1647 } | |
277 | 1648 |
1649 /* Otherwise set up data on this window; select its buffer and point value */ | |
1650 | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1651 if (update_mode_line) |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
1652 set_buffer_internal_1 (XBUFFER (w->buffer)); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1653 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1654 set_buffer_temp (XBUFFER (w->buffer)); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1655 |
6705 | 1656 opoint = PT; |
277 | 1657 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1658 /* If %c is in mode line, update it if needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1659 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1660 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1661 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1662 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1663 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1664 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1665 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1666 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1667 |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1668 /* Count number of windows showing the selected buffer. |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1669 An indirect buffer counts as its base buffer. */ |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1670 |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1671 if (!just_this_one) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1672 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1673 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1674 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1675 window_base = XBUFFER (XWINDOW (selected_window)->buffer); |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1676 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1677 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1678 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1679 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1680 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1681 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1682 } |
277 | 1683 |
1684 /* POINT refers normally to the selected window. | |
1685 For any other window, set up appropriate value. */ | |
1686 | |
1687 if (!EQ (window, selected_window)) | |
1688 { | |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1689 int new_pt = marker_position (w->pointm); |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1690 if (new_pt < BEGV) |
277 | 1691 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1692 new_pt = BEGV; |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1693 Fset_marker (w->pointm, make_number (new_pt), Qnil); |
277 | 1694 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1695 else if (new_pt > (ZV - 1)) |
277 | 1696 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1697 new_pt = ZV; |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1698 Fset_marker (w->pointm, make_number (new_pt), Qnil); |
277 | 1699 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1700 /* We don't use SET_PT so that the point-motion hooks don't run. */ |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1701 BUF_PT (current_buffer) = new_pt; |
277 | 1702 } |
1703 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1704 /* If any of the character widths specified in the display table |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1705 have changed, invalidate the width run cache. It's true that this |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1706 may be a bit late to catch such changes, but the rest of |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1707 redisplay goes (non-fatally) haywire when the display table is |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1708 changed, so why should we worry about doing any better? */ |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1709 if (current_buffer->width_run_cache) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1710 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1711 struct Lisp_Char_Table *disptab = buffer_display_table (); |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1712 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1713 if (! disptab_matches_widthtab (disptab, |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1714 XVECTOR (current_buffer->width_table))) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1715 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1716 invalidate_region_cache (current_buffer, |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1717 current_buffer->width_run_cache, |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1718 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1719 recompute_width_table (current_buffer, disptab); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1720 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1721 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1722 |
277 | 1723 /* If window-start is screwed up, choose a new one. */ |
1724 if (XMARKER (w->start)->buffer != current_buffer) | |
1725 goto recenter; | |
1726 | |
1727 startp = marker_position (w->start); | |
1728 | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1729 /* If someone specified a new starting point but did not insist, |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1730 check whether it can be used. */ |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1731 if (!NILP (w->optional_new_start)) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1732 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1733 w->optional_new_start = Qnil; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1734 /* Check whether this start pos is usable given where point is. */ |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1735 |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1736 pos = *compute_motion (startp, 0, |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1737 (((EQ (window, minibuf_window) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1738 && startp == BEG) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1739 ? minibuf_prompt_width : 0) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1740 + (hscroll ? 1 - hscroll : 0)), |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1741 0, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1742 PT, height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1743 /* BUG FIX: See the comment of |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1744 Fpos_visible_in_window_p (window.c). */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1745 - (1 << (BITS_PER_SHORT - 1)), |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1746 width, hscroll, pos_tab_offset (w, startp), w); |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1747 /* If PT does fit on the screen, we will use this start pos, |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1748 so do so by setting force_start. */ |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1749 if (pos.bufpos == PT) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1750 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1751 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1752 |
433 | 1753 /* Handle case where place to start displaying has been specified, |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1754 unless the specified location is outside the accessible range. */ |
485 | 1755 if (!NILP (w->force_start)) |
277 | 1756 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1757 w->force_start = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1758 /* Forget any recorded base line for line number display. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1759 w->base_line_number = Qnil; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1760 /* Redisplay the mode line. Select the buffer properly for that. |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1761 Also, run the hook window-scroll-functions |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1762 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1763 /* Note, we do this after clearing force_start because |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1764 if there's an error, it is better to forget about force_start |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1765 than to get into an infinite loop calling the hook functions |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1766 and having them get more errors. */ |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1767 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1768 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1769 { |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1770 Lisp_Object temp[3]; |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1771 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1772 set_buffer_temp (old); |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
1773 set_buffer_internal_1 (XBUFFER (w->buffer)); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1774 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1775 w->update_mode_line = Qt; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1776 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1777 { |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1778 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1779 make_number (startp)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1780 startp = marker_position (w->start); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1781 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1782 } |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1783 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1784 XSETFASTINT (w->last_overlay_modified, 0); |
433 | 1785 if (startp < BEGV) startp = BEGV; |
1786 if (startp > ZV) startp = ZV; | |
277 | 1787 try_window (window, startp); |
1788 if (cursor_vpos < 0) | |
1789 { | |
1790 /* If point does not appear, move point so it does appear */ | |
1791 pos = *compute_motion (startp, 0, | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1792 (((EQ (window, minibuf_window) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1793 && startp == BEG) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1794 ? minibuf_prompt_width : 0) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1795 + (hscroll ? 1 - hscroll : 0)), |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1796 0, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1797 ZV, height / 2, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
1798 - (1 << (BITS_PER_SHORT - 1)), |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1799 width, hscroll, pos_tab_offset (w, startp), w); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1800 BUF_PT (current_buffer) = pos.bufpos; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1801 if (w != XWINDOW (selected_window)) |
6705 | 1802 Fset_marker (w->pointm, make_number (PT), Qnil); |
277 | 1803 else |
1804 { | |
5340
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
1805 if (current_buffer == old) |
6705 | 1806 lpoint = PT; |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1807 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
11810 | 1808 + minmax (0, pos.hpos, width)); |
769 | 1809 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
277 | 1810 } |
9218
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
1811 /* If we are highlighting the region, |
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
1812 then we just changed the region, so redisplay to show it. */ |
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
1813 if (!NILP (Vtransient_mark_mode) |
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
1814 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1815 { |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1816 cancel_my_columns (XWINDOW (window)); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1817 try_window (window, startp); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1818 } |
277 | 1819 } |
1820 goto done; | |
1821 } | |
1822 | |
1823 /* Handle case where text has not changed, only point, | |
14178
4c8fdbefbb58
(redisplay_window): Fix minor bug in Fset_marker call.
Richard M. Stallman <rms@gnu.org>
parents:
14133
diff
changeset
|
1824 and it has not moved off the frame. */ |
277 | 1825 |
1826 /* This code is not used for minibuffer for the sake of | |
1827 the case of redisplaying to replace an echo area message; | |
1828 since in that case the minibuffer contents per se are usually unchanged. | |
1829 This code is of no real use in the minibuffer since | |
1830 the handling of this_line_bufpos, etc., | |
1831 in redisplay handles the same cases. */ | |
1832 | |
1833 if (XFASTINT (w->last_modified) >= MODIFF | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1834 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF |
12493
f8ada5acbaec
(redisplay_window): Fix typos in clip_changed change.
Richard M. Stallman <rms@gnu.org>
parents:
12472
diff
changeset
|
1835 && PT >= startp && !current_buffer->clip_changed |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1836 && (just_this_one || WINDOW_FULL_WIDTH_P (w)) |
11085
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
1837 /* If force-mode-line-update was called, really redisplay; |
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
1838 that's how redisplay is forced after e.g. changing |
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
1839 buffer-invisibility-spec. */ |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
1840 && NILP (w->update_mode_line) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1841 /* Can't use this case if highlighting a region. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1842 && !(!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1843 && NILP (w->region_showing) |
7927
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
1844 /* If end pos is out of date, scroll bar and percentage will be wrong */ |
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
1845 && INTEGERP (w->window_end_vpos) |
e02087efad68
(redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents:
7913
diff
changeset
|
1846 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height) |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1847 && !EQ (window, minibuf_window) |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
1848 && (!MARKERP (Voverlay_arrow_position) |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
1849 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
277 | 1850 { |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
1851 /* All positions in this clause are relative to the window edge. */ |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
1852 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1853 int this_scroll_margin = scroll_margin; |
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
1854 int last_point_y = XFASTINT (w->last_point_y) - XINT (w->top); |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
1855 int last_point_x = (XFASTINT (w->last_point_x) - WINDOW_LEFT_MARGIN (w)); |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1856 |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1857 /* Find where PT is located now on the frame. */ |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
1858 /* Check just_this_one as a way of verifying that the |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
1859 window edges have not changed. */ |
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
1860 if (PT == XFASTINT (w->last_point) && just_this_one) |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1861 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
1862 pos.hpos = last_point_x; |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
1863 pos.vpos = last_point_y; |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1864 pos.bufpos = PT; |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1865 } |
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
1866 else if (PT > XFASTINT (w->last_point) |
19478
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
1867 && XFASTINT (w->last_point) > startp && just_this_one |
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
1868 /* We can't use this if point is in the left margin of a |
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
1869 hscrolled window, because w->last_point_x has been |
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
1870 clipped to the window edges. */ |
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
1871 && !(last_point_x <= 0 && hscroll)) |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1872 { |
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
1873 pos = *compute_motion (XFASTINT (w->last_point), |
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
1874 last_point_y, last_point_x, 0, |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1875 PT, height, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1876 /* BUG FIX: See the comment of |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1877 Fpos_visible_in_window_p (window.c). */ |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1878 - (1 << (BITS_PER_SHORT - 1)), |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1879 width, hscroll, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1880 pos_tab_offset (w, startp), w); |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1881 } |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1882 else |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1883 { |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1884 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), 0, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1885 PT, height, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1886 /* BUG FIX: See the comment of |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1887 Fpos_visible_in_window_p (window.c). */ |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1888 - (1 << (BITS_PER_SHORT - 1)), |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1889 width, hscroll, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1890 pos_tab_offset (w, startp), w); |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
1891 } |
277 | 1892 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1893 /* Don't use a scroll margin that is negative or too large. */ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1894 if (this_scroll_margin < 0) |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1895 this_scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1896 |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1897 if (XINT (w->height) < 4 * scroll_margin) |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1898 this_scroll_margin = XINT (w->height) / 4; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1899 |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1900 /* If point fits on the screen, and not within the scroll margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1901 we are ok. */ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1902 if (pos.vpos < height - this_scroll_margin |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
1903 && (pos.vpos >= this_scroll_margin || startp == BEGV)) |
277 | 1904 { |
769 | 1905 /* Ok, point is still on frame */ |
1906 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
277 | 1907 { |
1908 /* These variables are supposed to be origin 1 */ | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1909 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
11810 | 1910 + minmax (0, pos.hpos, width)); |
769 | 1911 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
277 | 1912 } |
1913 /* This doesn't do the trick, because if a window to the right of | |
1914 this one must be redisplayed, this does nothing because there | |
769 | 1915 is nothing in DesiredFrame yet, and then the other window is |
277 | 1916 redisplayed, making likes that are empty in this window's columns. |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1917 if (WINDOW_FULL_WIDTH_P (w)) |
277 | 1918 preserve_my_columns (w); |
1919 */ | |
1920 goto done; | |
1921 } | |
1922 /* Don't bother trying redisplay with same start; | |
1923 we already know it will lose */ | |
1924 } | |
1925 /* If current starting point was originally the beginning of a line | |
1926 but no longer is, find a new starting point. */ | |
485 | 1927 else if (!NILP (w->start_at_line_beg) |
8594
4d8d02befd11
(redisplay_window): Don't access text before BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
8514
diff
changeset
|
1928 && !(startp <= BEGV |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1929 || FETCH_BYTE (startp - 1) == '\n')) |
277 | 1930 { |
1931 goto recenter; | |
1932 } | |
1933 else if (just_this_one && !MINI_WINDOW_P (w) | |
6705 | 1934 && PT >= startp |
277 | 1935 && XFASTINT (w->last_modified) |
3648
9838d64cc5ae
* xdisp.c (redisplay_window): Don't call try_window_id if the
Jim Blandy <jimb@redhat.com>
parents:
3586
diff
changeset
|
1936 /* or else vmotion on first line won't work. */ |
9838d64cc5ae
* xdisp.c (redisplay_window): Don't call try_window_id if the
Jim Blandy <jimb@redhat.com>
parents:
3586
diff
changeset
|
1937 && ! NILP (w->start_at_line_beg) |
277 | 1938 && ! EQ (w->window_end_valid, Qnil) |
12493
f8ada5acbaec
(redisplay_window): Fix typos in clip_changed change.
Richard M. Stallman <rms@gnu.org>
parents:
12472
diff
changeset
|
1939 && do_id && !current_buffer->clip_changed |
277 | 1940 && !blank_end_of_window |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1941 && WINDOW_FULL_WIDTH_P (w) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1942 /* Can't use this case if highlighting a region. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1943 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1944 && !NILP (current_buffer->mark_active)) |
11971
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
1945 /* Don't use try_window_id if newline |
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
1946 doesn't display as the end of a line. */ |
d72fbbe25780
(redisplay_window): Don't use try_window_id if
Karl Heuer <kwzh@gnu.org>
parents:
11968
diff
changeset
|
1947 && !(dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, '\n'))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1948 && NILP (w->region_showing) |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1949 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 1950 && EQ (last_arrow_string, Voverlay_arrow_string) |
769 | 1951 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f))) |
277 | 1952 && tem != -2) |
1953 { | |
1954 /* tem > 0 means success. tem == -1 means choose new start. | |
1955 tem == -2 means try again with same start, | |
1956 and nothing but whitespace follows the changed stuff. | |
1957 tem == 0 means try again with same start. */ | |
1958 if (tem > 0) | |
1959 goto done; | |
1960 } | |
1961 else if (startp >= BEGV && startp <= ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1962 && (startp < ZV |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1963 /* Avoid starting at end of buffer. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1964 #if 0 /* This change causes trouble for M-! finger & RET. |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1965 It will have to be considered later. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1966 || ! EQ (window, selected_window) |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1967 /* Don't do the recentering if redisplay |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1968 is not for no user action. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1969 || preserve_echo_area |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1970 #endif |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1971 || startp == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1972 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1973 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 1974 { |
1975 /* Try to redisplay starting at same place as before */ | |
769 | 1976 /* If point has not moved off frame, accept the results */ |
277 | 1977 try_window (window, startp); |
1978 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1979 { |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1980 if (!just_this_one || current_buffer->clip_changed |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1981 || beg_unchanged < startp) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1982 /* Forget any recorded base line for line number display. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1983 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1984 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1985 } |
277 | 1986 else |
1987 cancel_my_columns (w); | |
1988 } | |
1989 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1990 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1991 XSETFASTINT (w->last_overlay_modified, 0); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1992 /* Redisplay the mode line. Select the buffer properly for that. */ |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1993 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1994 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1995 set_buffer_temp (old); |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
1996 set_buffer_internal_1 (XBUFFER (w->buffer)); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1997 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1998 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1999 } |
277 | 2000 |
2001 /* Try to scroll by specified few lines */ | |
2002 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2003 if (scroll_conservatively && !current_buffer->clip_changed |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2004 && startp >= BEGV && startp <= ZV) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2005 { |
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2006 int this_scroll_margin = scroll_margin; |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2007 int scroll_margin_pos; |
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2008 |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2009 /* Don't use a scroll margin that is negative or too large. */ |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2010 if (this_scroll_margin < 0) |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2011 this_scroll_margin = 0; |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2012 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2013 if (XINT (w->height) < 4 * this_scroll_margin) |
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2014 this_scroll_margin = XINT (w->height) / 4; |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2015 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2016 scroll_margin_pos = Z - XFASTINT (w->window_end_pos); |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2017 if (this_scroll_margin) |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2018 { |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2019 pos = *vmotion (scroll_margin_pos, -this_scroll_margin, w); |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2020 scroll_margin_pos = pos.bufpos; |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2021 } |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2022 if (PT >= scroll_margin_pos) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2023 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2024 struct position pos; |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2025 pos = *compute_motion (scroll_margin_pos, 0, 0, 0, |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2026 PT, XFASTINT (w->height), 0, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2027 XFASTINT (w->width), XFASTINT (w->hscroll), |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2028 pos_tab_offset (w, startp), w); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2029 if (pos.vpos > scroll_conservatively) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2030 goto scroll_fail_1; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2031 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2032 pos = *vmotion (startp, pos.vpos + 1, w); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2033 |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2034 if (! NILP (Vwindow_scroll_functions)) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2035 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2036 Fset_marker (w->start, make_number (pos.bufpos), Qnil); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2037 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2038 make_number (pos.bufpos)); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2039 pos.bufpos = marker_position (w->start); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2040 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2041 try_window (window, pos.bufpos); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2042 if (cursor_vpos >= 0) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2043 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2044 if (!just_this_one || current_buffer->clip_changed |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2045 || beg_unchanged < startp) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2046 /* Forget any recorded base line for line number display. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2047 w->base_line_number = Qnil; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2048 goto done; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2049 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2050 else |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2051 cancel_my_columns (w); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2052 } |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2053 |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2054 scroll_margin_pos = startp; |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2055 if (this_scroll_margin) |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2056 { |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2057 pos = *vmotion (scroll_margin_pos, this_scroll_margin, w); |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2058 scroll_margin_pos = pos.bufpos; |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2059 } |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2060 if (PT < scroll_margin_pos) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2061 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2062 struct position pos; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2063 pos = *compute_motion (PT, 0, 0, 0, |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2064 scroll_margin_pos, XFASTINT (w->height), 0, |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2065 XFASTINT (w->width), XFASTINT (w->hscroll), |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2066 pos_tab_offset (w, startp), w); |
19061
e2be10e9bf9d
(redisplay_window): Fix one-off in handling
Richard M. Stallman <rms@gnu.org>
parents:
19045
diff
changeset
|
2067 if (pos.vpos > scroll_conservatively) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2068 goto scroll_fail_1; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2069 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2070 pos = *vmotion (startp, -pos.vpos, w); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2071 |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2072 if (! NILP (Vwindow_scroll_functions)) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2073 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2074 Fset_marker (w->start, make_number (pos.bufpos), Qnil); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2075 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2076 make_number (pos.bufpos)); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2077 pos.bufpos = marker_position (w->start); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2078 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2079 try_window (window, pos.bufpos); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2080 if (cursor_vpos >= 0) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2081 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2082 if (!just_this_one || current_buffer->clip_changed |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2083 || beg_unchanged < startp) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2084 /* Forget any recorded base line for line number display. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2085 w->base_line_number = Qnil; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2086 goto done; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2087 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2088 else |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2089 cancel_my_columns (w); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2090 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2091 scroll_fail_1: ; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2092 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2093 |
13760
7c7cc29b994e
(redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents:
13733
diff
changeset
|
2094 if (scroll_step && !current_buffer->clip_changed |
7c7cc29b994e
(redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents:
13733
diff
changeset
|
2095 && startp >= BEGV && startp <= ZV) |
277 | 2096 { |
6705 | 2097 if (PT > startp) |
277 | 2098 { |
11810 | 2099 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w); |
277 | 2100 if (pos.vpos >= height) |
2101 goto scroll_fail; | |
2102 } | |
2103 | |
11810 | 2104 pos = *vmotion (startp, (PT < startp ? - scroll_step : scroll_step), w); |
277 | 2105 |
6705 | 2106 if (PT >= pos.bufpos) |
277 | 2107 { |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2108 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2109 { |
14988
c833cd83414c
(redisplay_window): Move w->start marker before
Richard M. Stallman <rms@gnu.org>
parents:
14683
diff
changeset
|
2110 Fset_marker (w->start, make_number (pos.bufpos), Qnil); |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2111 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2112 make_number (pos.bufpos)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2113 pos.bufpos = marker_position (w->start); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2114 } |
277 | 2115 try_window (window, pos.bufpos); |
2116 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2117 { |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2118 if (!just_this_one || current_buffer->clip_changed |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2119 || beg_unchanged < startp) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2120 /* Forget any recorded base line for line number display. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2121 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2122 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2123 } |
277 | 2124 else |
2125 cancel_my_columns (w); | |
2126 } | |
2127 scroll_fail: ; | |
2128 } | |
2129 | |
2130 /* Finally, just choose place to start which centers point */ | |
2131 | |
2132 recenter: | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2133 /* Forget any previously recorded base line for line number display. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2134 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2135 |
11810 | 2136 pos = *vmotion (PT, - (height / 2), w); |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
2137 /* Set startp here explicitly in case that helps avoid an infinite loop |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
2138 in case the window-scroll-functions functions get errors. */ |
14178
4c8fdbefbb58
(redisplay_window): Fix minor bug in Fset_marker call.
Richard M. Stallman <rms@gnu.org>
parents:
14133
diff
changeset
|
2139 Fset_marker (w->start, make_number (pos.bufpos), Qnil); |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2140 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2141 { |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2142 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2143 make_number (pos.bufpos)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2144 pos.bufpos = marker_position (w->start); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2145 } |
277 | 2146 try_window (window, pos.bufpos); |
2147 | |
2148 startp = marker_position (w->start); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2149 w->start_at_line_beg |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2150 = (startp == BEGV || FETCH_BYTE (startp - 1) == '\n') ? Qt : Qnil; |
277 | 2151 |
2152 done: | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2153 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2154 /* If window not full width, must redo its mode line |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2155 if the window to its side is being redone */ |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2156 || (!just_this_one && !WINDOW_FULL_WIDTH_P (w)) |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2157 || INTEGERP (w->base_line_pos) |
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2158 || (!NILP (w->column_number_displayed) |
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
2159 && XFASTINT (w->column_number_displayed) != current_column ())) |
277 | 2160 && height != XFASTINT (w->height)) |
2161 display_mode_line (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2162 if (! line_number_displayed |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2163 && ! BUFFERP (w->base_line_pos)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2164 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2165 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2166 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2167 } |
277 | 2168 |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2169 /* When we reach a frame's selected window, redo the frame's menu bar. */ |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2170 if (update_mode_line |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
2171 && (FRAME_WINDOW_P (f) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2172 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
2173 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2174 FRAME_EXTERNAL_MENU_BAR (f) |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2175 #else |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2176 FRAME_MENU_BAR_LINES (f) > 0 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2177 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2178 : FRAME_MENU_BAR_LINES (f) > 0) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2179 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2180 display_menu_bar (w); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2181 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2182 finish_scroll_bars: |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2183 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2184 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2185 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2186 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2187 /* Calculate the start and end positions for the current window. |
2874
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2188 At some point, it would be nice to choose between scrollbars |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2189 which reflect the whole buffer size, with special markers |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2190 indicating narrowing, and scrollbars which reflect only the |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2191 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2192 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2193 Note that minibuffers sometimes aren't displaying any text. */ |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2194 if (! MINI_WINDOW_P (w) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2195 || (w == XWINDOW (minibuf_window) && ! echo_area_glyphs)) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2196 { |
2929
f3c44426bed2
Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
Jim Blandy <jimb@redhat.com>
parents:
2904
diff
changeset
|
2197 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2198 start = marker_position (w->start) - BEGV; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2199 /* I don't think this is guaranteed to be right. For the |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2200 moment, we'll pretend it is. */ |
3880
ef6a4d39634b
* xdisp.c (redisplay_window): Remember to compute end relative to
Jim Blandy <jimb@redhat.com>
parents:
3788
diff
changeset
|
2201 end = (Z - XINT (w->window_end_pos)) - BEGV; |
2874
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2202 |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2203 if (end < start) end = start; |
2929
f3c44426bed2
Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
Jim Blandy <jimb@redhat.com>
parents:
2904
diff
changeset
|
2204 if (whole < (end - start)) whole = end - start; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2205 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2206 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2207 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2208 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2209 /* Indicate what this scroll bar ought to be displaying now. */ |
3788
41a297faf4ac
* xdisp.c (redisplay_window): No need to subtract one from start
Jim Blandy <jimb@redhat.com>
parents:
3750
diff
changeset
|
2210 (*set_vertical_scroll_bar_hook) (w, end - start, whole, start); |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2211 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2212 /* Note that we actually used the scroll bar attached to this window, |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2213 so it shouldn't be deleted at the end of redisplay. */ |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2214 (*redeem_scroll_bar_hook) (w); |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2215 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2216 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
2217 BUF_PT (current_buffer) = opoint; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2218 if (update_mode_line) |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
2219 set_buffer_internal_1 (old); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2220 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2221 set_buffer_temp (old); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
2222 BUF_PT (current_buffer) = lpoint; |
277 | 2223 } |
2224 | |
2225 /* Do full redisplay on one window, starting at position `pos'. */ | |
2226 | |
2227 static void | |
2228 try_window (window, pos) | |
2229 Lisp_Object window; | |
2230 register int pos; | |
2231 { | |
2232 register struct window *w = XWINDOW (window); | |
2233 register int height = window_internal_height (w); | |
2234 register int vpos = XFASTINT (w->top); | |
2235 register int last_text_vpos = vpos; | |
769 | 2236 FRAME_PTR f = XFRAME (w->frame); |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2237 int width = window_internal_width (w) - 1; |
277 | 2238 struct position val; |
2239 | |
16738
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2240 /* POS should never be out of range! */ |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2241 if (pos < XBUFFER (w->buffer)->begv |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2242 || pos > XBUFFER (w->buffer)->zv) |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2243 abort (); |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2244 |
277 | 2245 Fset_marker (w->start, make_number (pos), Qnil); |
2246 cursor_vpos = -1; | |
2247 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2248 zv_strings_seen = 0; |
277 | 2249 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2250 val.ovstring_chars_done = 0; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2251 val.tab_offset = pos_tab_offset (w, pos); |
277 | 2252 |
2253 while (--height >= 0) | |
2254 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2255 val = *display_text_line (w, pos, vpos, val.hpos, val.tab_offset, |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2256 val.ovstring_chars_done); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2257 /* The following code is omitted because we maintain tab_offset |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2258 in VAL. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2259 #if 0 |
277 | 2260 tab_offset += width; |
2261 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2262 #endif /* 0 */ |
277 | 2263 vpos++; |
2264 if (pos != val.bufpos) | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2265 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2266 int invis = 0; |
6065
ab1aef4b0e07
(try_window): Add #ifdef USE_TEXT_PROPERTIES around call to Fget_text_property.
Karl Heuer <kwzh@gnu.org>
parents:
5942
diff
changeset
|
2267 #ifdef USE_TEXT_PROPERTIES |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2268 Lisp_Object invis_prop; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2269 invis_prop = Fget_char_property (val.bufpos-1, Qinvisible, window); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2270 invis = TEXT_PROP_MEANS_INVISIBLE (invis_prop); |
6065
ab1aef4b0e07
(try_window): Add #ifdef USE_TEXT_PROPERTIES around call to Fget_text_property.
Karl Heuer <kwzh@gnu.org>
parents:
5942
diff
changeset
|
2271 #endif |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2272 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2273 last_text_vpos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2274 /* Next line, unless prev line ended in end of buffer with no cr */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2275 = vpos - (val.vpos |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2276 && (FETCH_BYTE (val.bufpos - 1) != '\n' || invis)); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2277 } |
277 | 2278 pos = val.bufpos; |
2279 } | |
2280 | |
2281 /* If last line is continued in middle of character, | |
769 | 2282 include the split character in the text considered on the frame */ |
277 | 2283 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
2284 pos++; | |
2285 | |
769 | 2286 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 2287 if (XFASTINT (w->window_end_pos) == 0 |
2288 && Z != pos) | |
2289 w->update_mode_line = Qt; | |
2290 | |
769 | 2291 /* Say where last char on frame will be, once redisplay is finished. */ |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2292 XSETFASTINT (w->window_end_pos, Z - pos); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2293 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top)); |
277 | 2294 /* But that is not valid info until redisplay finishes. */ |
2295 w->window_end_valid = Qnil; | |
2296 } | |
2297 | |
2298 /* Try to redisplay when buffer is modified locally, | |
2299 computing insert/delete line to preserve text outside | |
2300 the bounds of the changes. | |
2301 Return 1 if successful, 0 if if cannot tell what to do, | |
2302 or -1 to tell caller to find a new window start, | |
2303 or -2 to tell caller to do normal redisplay with same window start. */ | |
2304 | |
2305 static int | |
2306 try_window_id (window) | |
2307 Lisp_Object window; | |
2308 { | |
2309 int pos; | |
2310 register struct window *w = XWINDOW (window); | |
2311 register int height = window_internal_height (w); | |
769 | 2312 FRAME_PTR f = XFRAME (w->frame); |
277 | 2313 int top = XFASTINT (w->top); |
2314 int start = marker_position (w->start); | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2315 int width = window_internal_width (w) - 1; |
277 | 2316 int hscroll = XINT (w->hscroll); |
2317 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2318 int did_motion; |
277 | 2319 register int vpos; |
2320 register int i, tem; | |
2321 int last_text_vpos = 0; | |
2322 int stop_vpos; | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2323 int selective = (INTEGERP (current_buffer->selective_display) |
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2324 ? XINT (current_buffer->selective_display) |
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2325 : !NILP (current_buffer->selective_display) ? -1 : 0); |
277 | 2326 |
2327 struct position val, bp, ep, xp, pp; | |
2328 int scroll_amount = 0; | |
2329 int delta; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2330 int epto, old_tick; |
277 | 2331 |
2332 if (GPT - BEG < beg_unchanged) | |
2333 beg_unchanged = GPT - BEG; | |
2334 if (Z - GPT < end_unchanged) | |
2335 end_unchanged = Z - GPT; | |
2336 | |
5739
0709eb474647
(try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
5676
diff
changeset
|
2337 if (beg_unchanged + BEG < start) |
277 | 2338 return 0; /* Give up if changes go above top of window */ |
2339 | |
2340 /* Find position before which nothing is changed. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2341 bp = *compute_motion (start, 0, lmargin, 0, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2342 min (ZV, beg_unchanged + BEG), height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2343 /* BUG FIX: See the comment of |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2344 Fpos_visible_in_window_p() (window.c). */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2345 - (1 << (BITS_PER_SHORT - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2346 width, hscroll, pos_tab_offset (w, start), w); |
277 | 2347 if (bp.vpos >= height) |
368 | 2348 { |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
2349 if (PT < bp.bufpos) |
368 | 2350 { |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
2351 /* All changes are beyond the window end, and point is on the screen. |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
2352 We don't need to change the text at all. |
368 | 2353 But we need to update window_end_pos to account for |
2354 any change in buffer size. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2355 bp = *compute_motion (start, 0, lmargin, 0, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2356 ZV, height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2357 /* BUG FIX: See the comment of |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2358 Fpos_visible_in_window_p() (window.c). */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2359 - (1 << (BITS_PER_SHORT - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2360 width, hscroll, pos_tab_offset (w, start), w); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2361 XSETFASTINT (w->window_end_vpos, height); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2362 XSETFASTINT (w->window_end_pos, Z - bp.bufpos); |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2363 goto findpoint; |
368 | 2364 } |
2365 return 0; | |
2366 } | |
277 | 2367 |
2368 vpos = bp.vpos; | |
2369 | |
769 | 2370 /* Find beginning of that frame line. Must display from there. */ |
11810 | 2371 bp = *vmotion (bp.bufpos, 0, w); |
277 | 2372 |
2373 pos = bp.bufpos; | |
2374 val.hpos = lmargin; | |
2375 if (pos < start) | |
2376 return -1; | |
2377 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2378 did_motion = 0; |
277 | 2379 /* If about to start displaying at the beginning of a continuation line, |
769 | 2380 really start with previous frame line, in case it was not |
277 | 2381 continued when last redisplayed */ |
528 | 2382 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0) |
2383 || | |
2384 /* Likewise if we have to worry about selective display. */ | |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2385 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0)) |
277 | 2386 { |
11810 | 2387 bp = *vmotion (bp.bufpos, -1, w); |
277 | 2388 --vpos; |
2389 pos = bp.bufpos; | |
2390 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2391 val.tab_offset = bp.tab_offset; /* Update tab offset. */ |
277 | 2392 |
2393 if (bp.contin && bp.hpos != lmargin) | |
2394 { | |
2395 val.hpos = bp.prevhpos - width + lmargin; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2396 val.tab_offset = bp.tab_offset + bp.prevhpos - width; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2397 did_motion = 1; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2398 DEC_POS (pos); |
277 | 2399 } |
2400 | |
2401 bp.vpos = vpos; | |
2402 | |
2403 /* Find first visible newline after which no more is changed. */ | |
2404 tem = find_next_newline (Z - max (end_unchanged, Z - ZV), 1); | |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2405 if (selective > 0) |
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2406 while (tem < ZV - 1 && (indented_beyond_p (tem, selective))) |
277 | 2407 tem = find_next_newline (tem, 1); |
2408 | |
2409 /* Compute the cursor position after that newline. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2410 ep = *compute_motion (pos, vpos, val.hpos, did_motion, tem, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2411 height, - (1 << (BITS_PER_SHORT - 1)), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2412 width, hscroll, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2413 /* We have tab offset in VAL, use it. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2414 val.tab_offset, w); |
277 | 2415 |
769 | 2416 /* If changes reach past the text available on the frame, |
2417 just display rest of frame. */ | |
277 | 2418 if (ep.bufpos > Z - XFASTINT (w->window_end_pos)) |
2419 stop_vpos = height; | |
2420 else | |
2421 stop_vpos = ep.vpos; | |
2422 | |
2423 /* If no newline before ep, the line ep is on includes some changes | |
2424 that must be displayed. Make sure we don't stop before it. */ | |
2425 /* Also, if changes reach all the way until ep.bufpos, | |
2426 it is possible that something was deleted after the | |
2427 newline before it, so the following line must be redrawn. */ | |
2428 if (stop_vpos == ep.vpos | |
2429 && (ep.bufpos == BEGV | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2430 || FETCH_BYTE (ep.bufpos - 1) != '\n' |
277 | 2431 || ep.bufpos == Z - end_unchanged)) |
2432 stop_vpos = ep.vpos + 1; | |
2433 | |
2434 cursor_vpos = -1; | |
2435 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2436 zv_strings_seen = 0; |
277 | 2437 |
2438 /* If changes do not reach to bottom of window, | |
2439 figure out how much to scroll the rest of the window */ | |
2440 if (stop_vpos < height) | |
2441 { | |
2442 /* Now determine how far up or down the rest of the window has moved */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2443 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1, |
277 | 2444 Z - XFASTINT (w->window_end_pos), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2445 /* Don't care for VPOS... */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2446 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2447 /* ... nor HPOS. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2448 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2449 width, hscroll, ep.tab_offset, w); |
277 | 2450 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos); |
2451 | |
769 | 2452 /* Is everything on frame below the changes whitespace? |
277 | 2453 If so, no scrolling is really necessary. */ |
2454 for (i = ep.bufpos; i < xp.bufpos; i++) | |
2455 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2456 tem = FETCH_BYTE (i); |
277 | 2457 if (tem != ' ' && tem != '\n' && tem != '\t') |
2458 break; | |
2459 } | |
2460 if (i == xp.bufpos) | |
2461 return -2; | |
2462 | |
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2463 XSETFASTINT (w->window_end_vpos, |
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2464 XFASTINT (w->window_end_vpos) + scroll_amount); |
277 | 2465 |
769 | 2466 /* Before doing any scrolling, verify that point will be on frame. */ |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2467 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height)) |
277 | 2468 { |
6705 | 2469 if (PT <= xp.bufpos) |
277 | 2470 { |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2471 pp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2472 PT, height, - (1 << (BITS_PER_SHORT - 1)), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2473 width, hscroll, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2474 /* We have tab offset in EP, use it. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2475 ep.tab_offset, w); |
277 | 2476 } |
2477 else | |
2478 { | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2479 pp = *compute_motion (xp.bufpos, xp.vpos, xp.hpos, 1, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2480 PT, height, - (1 << (BITS_PER_SHORT - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2481 width, hscroll, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2482 /* We have tab offset in XP, use it. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2483 xp.tab_offset, w); |
277 | 2484 } |
6705 | 2485 if (pp.bufpos < PT || pp.vpos == height) |
277 | 2486 return 0; |
2487 cursor_vpos = pp.vpos + top; | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2488 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width); |
277 | 2489 } |
2490 | |
2491 if (stop_vpos - scroll_amount >= height | |
2492 || ep.bufpos == xp.bufpos) | |
2493 { | |
2494 if (scroll_amount < 0) | |
2495 stop_vpos -= scroll_amount; | |
2496 scroll_amount = 0; | |
2497 /* In this path, we have altered window_end_vpos | |
2498 and not left it negative. | |
2499 We must make sure that, in case display is preempted | |
769 | 2500 before the frame changes to reflect what we do here, |
277 | 2501 further updates will not come to try_window_id |
769 | 2502 and assume the frame and window_end_vpos match. */ |
277 | 2503 blank_end_of_window = 1; |
2504 } | |
2505 else if (!scroll_amount) | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2506 { |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2507 /* Even if we don't need to scroll, we must adjust the |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2508 charstarts of subsequent lines (that we won't redisplay) |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2509 according to the amount of text inserted or deleted. */ |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2510 int oldpos = FRAME_CURRENT_GLYPHS (f)->charstarts[ep.vpos + top][0]; |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2511 int adjust = ep.bufpos - oldpos; |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2512 adjust_window_charstarts (w, ep.vpos + top - 1, adjust); |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2513 } |
277 | 2514 else if (bp.bufpos == Z - end_unchanged) |
2515 { | |
2516 /* If reprinting everything is nearly as fast as scrolling, | |
2517 don't bother scrolling. Can happen if lines are short. */ | |
769 | 2518 if (scroll_cost (f, bp.vpos + top - scroll_amount, |
277 | 2519 top + height - max (0, scroll_amount), |
2520 scroll_amount) | |
2521 > xp.bufpos - bp.bufpos - 20) | |
2522 /* Return "try normal display with same window-start." | |
2523 Too bad we can't prevent further scroll-thinking. */ | |
2524 return -2; | |
2525 /* If pure deletion, scroll up as many lines as possible. | |
2526 In common case of killing a line, this can save the | |
2527 following line from being overwritten by scrolling | |
2528 and therefore having to be redrawn. */ | |
769 | 2529 tem = scroll_frame_lines (f, bp.vpos + top - scroll_amount, |
6628
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2530 top + height - max (0, scroll_amount), |
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2531 scroll_amount, bp.bufpos); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2532 if (!tem) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2533 stop_vpos = height; |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2534 else |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2535 { |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2536 /* scroll_frame_lines did not properly adjust subsequent |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2537 lines' charstarts in the case where the text of the |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2538 screen line at bp.vpos has changed. |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2539 (This can happen in a deletion that ends in mid-line.) |
14036 | 2540 To adjust properly, we need to make things consistent |
2541 at the position ep. | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2542 So do a second adjust to make that happen. |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2543 Note that stop_vpos >= ep.vpos, so it is sufficient |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2544 to update the charstarts for lines at ep.vpos and below. */ |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2545 int oldstart |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2546 = FRAME_CURRENT_GLYPHS (f)->charstarts[ep.vpos + top][0]; |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2547 adjust_window_charstarts (w, ep.vpos + top - 1, |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2548 ep.bufpos - oldstart); |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2549 } |
277 | 2550 } |
2551 else if (scroll_amount) | |
2552 { | |
2553 /* If reprinting everything is nearly as fast as scrolling, | |
2554 don't bother scrolling. Can happen if lines are short. */ | |
2555 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an | |
2556 overestimate of cost of reprinting, since xp.bufpos | |
2557 would end up below the bottom of the window. */ | |
769 | 2558 if (scroll_cost (f, ep.vpos + top - scroll_amount, |
277 | 2559 top + height - max (0, scroll_amount), |
2560 scroll_amount) | |
2561 > xp.bufpos - ep.bufpos - 20) | |
2562 /* Return "try normal display with same window-start." | |
2563 Too bad we can't prevent further scroll-thinking. */ | |
2564 return -2; | |
769 | 2565 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount, |
277 | 2566 top + height - max (0, scroll_amount), |
6628
c359dfd21b00
(try_window_id): Pass new arg to scroll_frame_lines.
Richard M. Stallman <rms@gnu.org>
parents:
6622
diff
changeset
|
2567 scroll_amount, ep.bufpos); |
277 | 2568 if (!tem) stop_vpos = height; |
2569 } | |
2570 } | |
2571 | |
2572 /* In any case, do not display past bottom of window */ | |
2573 if (stop_vpos >= height) | |
2574 { | |
2575 stop_vpos = height; | |
2576 scroll_amount = 0; | |
2577 } | |
2578 | |
2579 /* Handle case where pos is before w->start -- | |
2580 can happen if part of line had been clipped and is not clipped now */ | |
2581 if (vpos == 0 && pos < marker_position (w->start)) | |
2582 Fset_marker (w->start, make_number (pos), Qnil); | |
2583 | |
2584 /* Redisplay the lines where the text was changed */ | |
2585 last_text_vpos = vpos; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2586 /* The following code is omitted because we maintain tab offset in |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2587 val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2588 #if 0 |
277 | 2589 tab_offset = pos_tab_offset (w, pos); |
2590 /* If we are starting display in mid-character, correct tab_offset | |
2591 to account for passing the line that that character really starts in. */ | |
2592 if (val.hpos < lmargin) | |
2593 tab_offset += width; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2594 #endif /* 0 */ |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2595 old_tick = MODIFF; |
277 | 2596 while (vpos < stop_vpos) |
2597 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2598 val = *display_text_line (w, pos, top + vpos++, val.hpos, val.tab_offset, |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2599 val.ovstring_chars_done); |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2600 /* If display_text_line ran a hook and changed some text, |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2601 redisplay all the way to bottom of buffer |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2602 So that we show the changes. */ |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2603 if (old_tick != MODIFF) |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2604 stop_vpos = height; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2605 /* The following code is omitted because we maintain tab offset |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2606 in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2607 #if 0 |
277 | 2608 tab_offset += width; |
2609 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2610 #endif |
277 | 2611 if (pos != val.bufpos) |
2612 last_text_vpos | |
2613 /* Next line, unless prev line ended in end of buffer with no cr */ | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2614 = vpos - (val.vpos && FETCH_BYTE (val.bufpos - 1) != '\n'); |
277 | 2615 pos = val.bufpos; |
2616 } | |
2617 | |
2618 /* There are two cases: | |
2619 1) we have displayed down to the bottom of the window | |
2620 2) we have scrolled lines below stop_vpos by scroll_amount */ | |
2621 | |
2622 if (vpos == height) | |
2623 { | |
2624 /* If last line is continued in middle of character, | |
769 | 2625 include the split character in the text considered on the frame */ |
277 | 2626 if (val.hpos < lmargin) |
2627 val.bufpos++; | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2628 XSETFASTINT (w->window_end_vpos, last_text_vpos); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2629 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
277 | 2630 } |
2631 | |
2632 /* If scrolling made blank lines at window bottom, | |
2633 redisplay to fill those lines */ | |
2634 if (scroll_amount < 0) | |
2635 { | |
2636 /* Don't consider these lines for general-purpose scrolling. | |
2637 That will save time in the scrolling computation. */ | |
769 | 2638 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos; |
277 | 2639 vpos = xp.vpos; |
2640 pos = xp.bufpos; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2641 val.hpos = xp.hpos; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2642 val.tab_offset = xp.tab_offset; |
277 | 2643 if (pos == ZV) |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2644 { /* Display from next line */ |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2645 vpos = height + scroll_amount; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2646 val.hpos = lmargin; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2647 val.tab_offset = 0; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2648 } |
277 | 2649 else if (xp.contin && xp.hpos != lmargin) |
2650 { | |
2651 val.hpos = xp.prevhpos - width + lmargin; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2652 val.tab_offset = xp.tab_offset + bp.prevhpos - width; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2653 DEC_POS (pos); |
277 | 2654 } |
2655 | |
2656 blank_end_of_window = 1; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2657 /* The following code is omitted because we maintain tab offset |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2658 in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2659 #if 0 |
277 | 2660 tab_offset = pos_tab_offset (w, pos); |
2661 /* If we are starting display in mid-character, correct tab_offset | |
2662 to account for passing the line that that character starts in. */ | |
2663 if (val.hpos < lmargin) | |
2664 tab_offset += width; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2665 #endif |
277 | 2666 while (vpos < height) |
2667 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2668 val = *display_text_line (w, pos, top + vpos++, val.hpos, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2669 val.tab_offset, val.ovstring_chars_done); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2670 /* The following code is omitted because we maintain tab |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2671 offset in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2672 #if 0 |
277 | 2673 tab_offset += width; |
2674 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2675 #endif /* 0 */ |
277 | 2676 pos = val.bufpos; |
2677 } | |
2678 | |
2679 /* Here is a case where display_text_line sets cursor_vpos wrong. | |
2680 Make it be fixed up, below. */ | |
2681 if (xp.bufpos == ZV | |
6705 | 2682 && xp.bufpos == PT) |
277 | 2683 cursor_vpos = -1; |
2684 } | |
2685 | |
769 | 2686 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 2687 if (XFASTINT (w->window_end_pos) == 0 |
2688 && Z != val.bufpos) | |
2689 w->update_mode_line = Qt; | |
2690 | |
2691 /* Attempt to adjust end-of-text positions to new bottom line */ | |
2692 if (scroll_amount) | |
2693 { | |
2694 delta = height - xp.vpos; | |
2695 if (delta < 0 | |
2696 || (delta > 0 && xp.bufpos <= ZV) | |
2697 || (delta == 0 && xp.hpos)) | |
2698 { | |
11810 | 2699 val = *vmotion (Z - XFASTINT (w->window_end_pos), delta, w); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2700 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2701 XSETFASTINT (w->window_end_vpos, |
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2702 XFASTINT (w->window_end_vpos) + val.vpos); |
277 | 2703 } |
2704 } | |
2705 | |
2706 w->window_end_valid = Qnil; | |
2707 | |
2708 /* If point was not in a line that was displayed, find it */ | |
2709 if (cursor_vpos < 0) | |
2710 { | |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2711 findpoint: |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2712 val = *compute_motion (start, 0, lmargin, 0, PT, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2713 /* Don't care for VPOS... */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2714 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2715 /* ... nor HPOS. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2716 1 << (BITS_PER_SHORT - 1), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2717 width, hscroll, pos_tab_offset (w, start), w); |
769 | 2718 /* Admit failure if point is off frame now */ |
277 | 2719 if (val.vpos >= height) |
2720 { | |
2721 for (vpos = 0; vpos < height; vpos++) | |
769 | 2722 cancel_line (vpos + top, f); |
277 | 2723 return 0; |
2724 } | |
2725 cursor_vpos = val.vpos + top; | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2726 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width); |
277 | 2727 } |
2728 | |
11810 | 2729 FRAME_CURSOR_X (f) = cursor_hpos; |
769 | 2730 FRAME_CURSOR_Y (f) = cursor_vpos; |
277 | 2731 |
2732 if (debug_end_pos) | |
2733 { | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2734 val = *compute_motion (start, 0, lmargin, 0, ZV, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2735 height, - (1 << (BITS_PER_SHORT - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2736 width, hscroll, pos_tab_offset (w, start), w); |
277 | 2737 if (val.vpos != XFASTINT (w->window_end_vpos)) |
2738 abort (); | |
2739 if (XFASTINT (w->window_end_pos) | |
2740 != Z - val.bufpos) | |
2741 abort (); | |
2742 } | |
2743 | |
2744 return 1; | |
2745 } | |
2746 | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2747 /* Copy LEN glyphs starting address FROM to the rope TO. |
301 | 2748 But don't actually copy the parts that would come in before S. |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2749 Value is TO, advanced past the copied data. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2750 F is the frame we are displaying in. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2751 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2752 static GLYPH * |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2753 copy_part_of_rope (f, to, s, from, len, face) |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2754 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2755 register GLYPH *to; /* Copy to here. */ |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2756 register GLYPH *s; /* Starting point. */ |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2757 Lisp_Object *from; /* Data to copy. */ |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2758 int len; |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2759 int face; /* Face to apply to glyphs which don't specify one. */ |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2760 { |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2761 int n = len; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2762 register Lisp_Object *fp = from; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2763 /* These cache the results of the last call to compute_glyph_face. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2764 int last_code = -1; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2765 int last_merged = 0; |
277 | 2766 |
9572 | 2767 #ifdef HAVE_FACES |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2768 if (! FRAME_TERMCAP_P (f)) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2769 while (n--) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2770 { |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2771 GLYPH glyph = (INTEGERP (*fp) ? XFASTINT (*fp) : 0); |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2772 int facecode; |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2773 unsigned int c = FAST_GLYPH_CHAR (glyph); |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2774 |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2775 if (c > MAX_CHAR) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2776 /* For an invalid character code, use space. */ |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2777 c = ' '; |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2778 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2779 if (FAST_GLYPH_FACE (glyph) == 0) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2780 /* If GLYPH has no face code, use FACE. */ |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2781 facecode = face; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2782 else if (FAST_GLYPH_FACE (glyph) == last_code) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2783 /* If it's same as previous glyph, use same result. */ |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2784 facecode = last_merged; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2785 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2786 { |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2787 /* Merge this glyph's face and remember the result. */ |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2788 last_code = FAST_GLYPH_FACE (glyph); |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2789 last_merged = facecode = compute_glyph_face (f, last_code, face); |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2790 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2791 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2792 if (to >= s) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2793 *to = FAST_MAKE_GLYPH (c, facecode); |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2794 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2795 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2796 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2797 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2798 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2799 while (n--) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2800 { |
6741
840862375e93
(copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents:
6740
diff
changeset
|
2801 if (to >= s) *to = (INTEGERP (*fp) ? XFASTINT (*fp) : 0); |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2802 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2803 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2804 } |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2805 return to; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2806 } |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2807 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2808 /* Correct a glyph by replacing its specified user-level face code |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2809 with a displayable computed face code. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2810 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2811 static GLYPH |
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2812 fix_glyph (f, glyph, cface) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2813 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2814 GLYPH glyph; |
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2815 int cface; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2816 { |
9572 | 2817 #ifdef HAVE_FACES |
6896
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2818 if (! FRAME_TERMCAP_P (f)) |
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2819 { |
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2820 if (FAST_GLYPH_FACE (glyph) != 0) |
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2821 cface = compute_glyph_face (f, FAST_GLYPH_FACE (glyph), cface); |
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2822 glyph = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), cface); |
9e949c4d0e4c
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
Karl Heuer <kwzh@gnu.org>
parents:
6872
diff
changeset
|
2823 } |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2824 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2825 return glyph; |
277 | 2826 } |
2827 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2828 /* Display one line of window W, starting at position START in W's buffer. |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2829 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2830 Display starting at horizontal position HPOS, expressed relative to |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2831 W's left edge. In situations where the text at START shouldn't |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2832 start at the left margin (i.e. when the window is hscrolled, or |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2833 we're continuing a line which left off in the midst of a |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2834 multi-column character), HPOS should be negative; we throw away |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2835 characters up 'til hpos = 0. So, HPOS must take hscrolling into |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2836 account. |
277 | 2837 |
2838 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations. | |
2839 | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2840 OVSTR_DONE is the number of chars of overlay before/after strings |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2841 at this position which have already been processed. |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2842 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2843 Display on position VPOS on the frame. It is origin 0, relative to |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2844 the top of the frame, not W. |
277 | 2845 |
2846 Returns a STRUCT POSITION giving character to start next line with | |
2847 and where to display it, including a zero or negative hpos. | |
2848 The vpos field is not really a vpos; it is 1 unless the line is continued */ | |
2849 | |
2850 struct position val_display_text_line; | |
2851 | |
2852 static struct position * | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2853 display_text_line (w, start, vpos, hpos, taboffset, ovstr_done) |
277 | 2854 struct window *w; |
2855 int start; | |
2856 int vpos; | |
2857 int hpos; | |
2858 int taboffset; | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
2859 int ovstr_done; |
277 | 2860 { |
2861 register int pos = start; | |
2862 register int c; | |
2863 register GLYPH *p1; | |
2864 register int pause; | |
2865 register unsigned char *p; | |
2866 GLYPH *endp; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2867 register GLYPH *leftmargin; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2868 register GLYPH *p1prev; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2869 register GLYPH *p1start; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2870 int prevpos; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2871 int *charstart; |
769 | 2872 FRAME_PTR f = XFRAME (w->frame); |
277 | 2873 int tab_width = XINT (current_buffer->tab_width); |
485 | 2874 int ctl_arrow = !NILP (current_buffer->ctl_arrow); |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2875 int width = window_internal_width (w) - 1; |
277 | 2876 struct position val; |
2877 int lastpos; | |
2878 int invis; | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2879 int last_invis_skip = 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2880 Lisp_Object last_invis_prop; |
277 | 2881 int hscroll = XINT (w->hscroll); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2882 int truncate = (hscroll |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2883 || (truncate_partial_width_windows |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2884 && !WINDOW_FULL_WIDTH_P (w)) |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2885 || !NILP (current_buffer->truncate_lines)); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2886 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2887 /* 1 if we should highlight the region. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2888 int highlight_region |
16069
8fe5e69de92a
(redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
2889 = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active) |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
2890 && (XWINDOW (current_buffer->last_selected_window) == w |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
2891 || highlight_nonselected_windows)); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2892 int region_beg, region_end; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2893 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2894 int selective = (INTEGERP (current_buffer->selective_display) |
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2895 ? XINT (current_buffer->selective_display) |
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2896 : !NILP (current_buffer->selective_display) ? -1 : 0); |
769 | 2897 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
2898 register struct Lisp_Char_Table *dp = window_display_table (w); |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2899 |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2900 Lisp_Object default_invis_vector[3]; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2901 /* Number of characters of ellipsis to display after an invisible line |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2902 if it calls for an ellipsis. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2903 Note that this value can be nonzero regardless of whether |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2904 selective display is enabled--you must check that separately. */ |
277 | 2905 int selective_rlen |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2906 = (dp && VECTORP (DISP_INVIS_VECTOR (dp)) |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2907 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2908 : !NILP (current_buffer->selective_display_ellipses) ? 3 : 0); |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2909 /* This is the sequence of Lisp objects to display |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2910 when there are invisible lines. */ |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2911 Lisp_Object *invis_vector_contents |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2912 = (dp && VECTORP (DISP_INVIS_VECTOR (dp)) |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2913 ? XVECTOR (DISP_INVIS_VECTOR (dp))->contents |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2914 : default_invis_vector); |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2915 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2916 GLYPH truncator = (dp == 0 || !INTEGERP (DISP_TRUNC_GLYPH (dp)) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2917 || !GLYPH_CHAR_VALID_P (XINT (DISP_TRUNC_GLYPH (dp))) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2918 ? '$' : XINT (DISP_TRUNC_GLYPH (dp))); |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2919 GLYPH continuer = (dp == 0 || !INTEGERP (DISP_CONTINUE_GLYPH (dp)) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
2920 || !GLYPH_CHAR_VALID_P (XINT (DISP_CONTINUE_GLYPH (dp))) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2921 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp))); |
277 | 2922 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2923 /* If 1, we must handle multibyte characters. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2924 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2925 /* Length of multibyte form of each character. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2926 int len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2927 /* Glyphs generated should be set this bit mask if text must be |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2928 displayed from right to left. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2929 GLYPH rev_dir_bit = (NILP (current_buffer->direction_reversed) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2930 ? 0 : GLYPH_MASK_REV_DIR); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2931 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2932 /* The next buffer location at which the face should change, due |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2933 to overlays or text property changes. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2934 int next_face_change; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2935 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2936 /* The next location where the `invisible' property changes, or an |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2937 overlay starts or ends. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2938 int next_boundary; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2939 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2940 /* The face we're currently using. */ |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2941 int current_face = 0; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2942 int i; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2943 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2944 XSETFASTINT (default_invis_vector[2], '.'); |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2945 default_invis_vector[0] = default_invis_vector[1] = default_invis_vector[2]; |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2946 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2947 get_display_line (f, vpos, WINDOW_LEFT_MARGIN (w)); |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
2948 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 2949 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2950 /* Show where to highlight the region. */ |
2965
5314fdcd87bc
(display_text_line): Highlight in any frame's sel window.
Richard M. Stallman <rms@gnu.org>
parents:
2929
diff
changeset
|
2951 if (highlight_region && XMARKER (current_buffer->mark)->buffer != 0 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
2952 /* Maybe highlight only in selected window. */ |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
2953 && (highlight_nonselected_windows |
3266
1173bc4814da
(display_text_line): Really check for just the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3265
diff
changeset
|
2954 || w == XWINDOW (selected_window))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2955 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2956 region_beg = marker_position (current_buffer->mark); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2957 if (PT < region_beg) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2958 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2959 region_end = region_beg; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2960 region_beg = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2961 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2962 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2963 region_end = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2964 w->region_showing = Qt; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2965 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2966 else |
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
2967 { |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
2968 region_beg = region_end = -1; |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
2969 w->region_showing = Qnil; |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
2970 } |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2971 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2972 if (MINI_WINDOW_P (w) |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2973 && start == BEG |
277 | 2974 && vpos == XFASTINT (w->top)) |
2975 { | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
2976 if (! NILP (minibuf_prompt)) |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2977 { |
18994
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
2978 int old_width = minibuf_prompt_width; |
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
2979 |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2980 minibuf_prompt_width |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
2981 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data, |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2982 XSTRING (minibuf_prompt)->size, |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2983 hpos + WINDOW_LEFT_MARGIN (w), |
9756
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2984 /* Display a space if we truncate. */ |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2985 ' ', |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2986 1, -1, |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2987 /* Truncate the prompt a little before the |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2988 margin, so user input can at least start |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2989 on the first line. */ |
17362
87db7dfa4a96
(display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17317
diff
changeset
|
2990 (XFASTINT (w->width) > 10 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
2991 ? XFASTINT (w->width) - 4 : -1), |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
2992 -1) |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2993 - hpos - WINDOW_LEFT_MARGIN (w)); |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2994 hpos += minibuf_prompt_width; |
18994
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
2995 taboffset -= minibuf_prompt_width - old_width; |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2996 } |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2997 else |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2998 minibuf_prompt_width = 0; |
277 | 2999 } |
3000 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3001 /* If we're hscrolled at all, use compute_motion to skip over any |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3002 text off the left edge of the window. compute_motion may know |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3003 tricks to do this faster than we can. */ |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3004 if (hpos < 0) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3005 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3006 struct position *left_edge |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3007 = compute_motion (pos, vpos, hpos, 0, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3008 ZV, vpos, 0, |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3009 width, hscroll, taboffset, w); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3010 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3011 /* Retrieve the buffer position and column provided by |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3012 compute_motion. We can't assume that the column will be |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3013 zero, because you may have multi-column characters crossing |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3014 the left margin. |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3015 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3016 compute_motion may have moved us past the screen position we |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3017 requested, if we hit a multi-column character, or the end of |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3018 the line. If so, back up. */ |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3019 if (left_edge->vpos > vpos |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3020 || left_edge->hpos > 0) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3021 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3022 pos = left_edge->bufpos; |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3023 /* Since this should not be a valid multibyte character, we |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3024 can decrease POS by 1. */ |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3025 pos--; |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3026 hpos = left_edge->prevhpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3027 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3028 else |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3029 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3030 pos = left_edge->bufpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3031 hpos = left_edge->hpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3032 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3033 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3034 |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3035 hpos += WINDOW_LEFT_MARGIN (w); |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3036 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3037 desired_glyphs->bufp[vpos] = start; |
277 | 3038 p1 = desired_glyphs->glyphs[vpos] + hpos; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3039 p1start = p1; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3040 charstart = desired_glyphs->charstarts[vpos] + hpos; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3041 /* In case we don't ever write anything into it... */ |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3042 desired_glyphs->charstarts[vpos][WINDOW_LEFT_MARGIN (w)] = -1; |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3043 leftmargin = desired_glyphs->glyphs[vpos] + WINDOW_LEFT_MARGIN (w); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3044 endp = leftmargin + width; |
277 | 3045 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3046 /* Arrange the overlays nicely for our purposes. Usually, we call |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3047 display_text_line on only one line at a time, in which case this |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3048 can't really hurt too much, or we call it on lines which appear |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3049 one after another in the buffer, in which case all calls to |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3050 recenter_overlay_lists but the first will be pretty cheap. */ |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3051 recenter_overlay_lists (current_buffer, pos); |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3052 |
277 | 3053 /* Loop generating characters. |
3054 Stop at end of buffer, before newline, | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3055 if reach or pass continuation column, |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3056 or at face change. */ |
277 | 3057 pause = pos; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3058 next_face_change = pos; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3059 next_boundary = pos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3060 p1prev = p1; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3061 prevpos = pos; |
18829
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3062 |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3063 /* If the window is hscrolled and point is in the invisible part of the |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3064 current line beyond the left margin we can record the cursor location |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3065 right away. */ |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3066 if (hscroll && start <= PT && PT < pos && cursor_vpos < 0) |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3067 { |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3068 cursor_vpos = vpos; |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3069 cursor_hpos = p1 - leftmargin; |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3070 } |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3071 |
18730
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
3072 while (p1 < endp) |
277 | 3073 { |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3074 if (pos >= pause) |
277 | 3075 { |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3076 int e_t_h; |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3077 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3078 while (pos == next_boundary) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3079 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3080 Lisp_Object position, limit, prop, ww; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3081 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3082 /* Display the overlay strings here, unless we're at ZV |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3083 and have already displayed the appropriate strings |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3084 on an earlier line. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3085 if (pos < ZV || !zv_strings_seen++) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3086 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3087 int ovlen; |
16245
d960549d163c
(display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents:
16197
diff
changeset
|
3088 unsigned char *ovstr; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3089 ovlen = overlay_strings (pos, w, &ovstr); |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3090 |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3091 if (ovlen > 0) |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3092 { |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3093 /* Skip the ones we did in a previous line. */ |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3094 ovstr += ovstr_done; |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3095 ovlen -= ovstr_done; |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3096 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3097 while (ovlen > 0) |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3098 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3099 int charset, cols; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3100 GLYPH g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3101 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3102 if (multibyte) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3103 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3104 c = STRING_CHAR_AND_LENGTH (ovstr, ovlen, len); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3105 ovstr += len, ovlen -= len, ovstr_done += len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3106 charset = CHAR_CHARSET (c); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3107 cols = (charset == CHARSET_COMPOSITION |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3108 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3109 : CHARSET_WIDTH (charset)); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3110 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3111 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3112 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3113 c = *ovstr++, ovlen--, ovstr_done++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3114 cols = 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3115 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3116 g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3117 while (cols-- > 0) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3118 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3119 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3120 *p1 = g, g |= GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3121 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3122 } |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3123 } |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3124 /* If we did all the overlay strings |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3125 and we have room for text, clear ovstr_done |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3126 just for neatness' sake. */ |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3127 if (ovlen == 0 && p1 < endp) |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3128 ovstr_done = 0; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3129 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3130 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3131 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3132 /* Did we reach point? Record the cursor location. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3133 if (pos == PT && cursor_vpos < 0) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3134 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3135 cursor_vpos = vpos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3136 cursor_hpos = p1 - leftmargin; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3137 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3138 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3139 if (pos >= ZV) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3140 break; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3141 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3142 XSETFASTINT (position, pos); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3143 limit = Fnext_overlay_change (position); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3144 #ifdef USE_TEXT_PROPERTIES |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3145 /* This is just an estimate to give reasonable |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3146 performance; nothing should go wrong if it is too small. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3147 if (XFASTINT (limit) > pos + 50) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3148 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3149 int limitpos = pos + 50; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3150 if (limitpos < Z) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3151 INC_POS (limitpos); /* Adjust to character boundary. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3152 XSETFASTINT (limit, limitpos); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3153 } |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3154 limit = Fnext_single_property_change (position, Qinvisible, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3155 Fcurrent_buffer (), limit); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3156 #endif |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3157 next_boundary = XFASTINT (limit); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3158 /* if the `invisible' property is set, we can skip to |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3159 the next property change. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3160 XSETWINDOW (ww, w); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3161 prop = Fget_char_property (position, Qinvisible, ww); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3162 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3163 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3164 if (pos < PT && next_boundary >= PT) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3165 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3166 cursor_vpos = vpos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3167 cursor_hpos = p1 - leftmargin; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3168 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3169 pos = next_boundary; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3170 last_invis_skip = pos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3171 last_invis_prop = prop; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3172 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3173 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3174 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3175 /* Did we reach point? Record the cursor location. */ |
6705 | 3176 if (pos == PT && cursor_vpos < 0) |
277 | 3177 { |
3178 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3179 cursor_hpos = p1 - leftmargin; |
277 | 3180 } |
3181 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3182 /* Did we hit the end of the visible region of the buffer? |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3183 Stop here. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3184 if (pos >= ZV) |
12293
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3185 { |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3186 /* Update charstarts for the end of this line. */ |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3187 /* Do nothing if off the left edge or at the right edge. */ |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3188 if (p1 >= leftmargin && p1 + 1 != endp) |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3189 { |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3190 int *p2x = &charstart[(p1 < leftmargin |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3191 ? leftmargin : p1) |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3192 - p1start]; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3193 *p2x++ = pos; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3194 } |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3195 break; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3196 } |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
3197 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3198 /* Figure out where (if at all) the |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3199 redisplay_end_trigger-hook should run. */ |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3200 if (MARKERP (w->redisplay_end_trigger) |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3201 && XMARKER (w->redisplay_end_trigger)->buffer != 0) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3202 e_t_h = marker_position (w->redisplay_end_trigger); |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3203 else if (INTEGERP (w->redisplay_end_trigger)) |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3204 e_t_h = XINT (w->redisplay_end_trigger); |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3205 else |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3206 e_t_h = ZV; |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3207 |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3208 /* If we've gone past the place to run a hook, |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3209 run the hook. */ |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3210 if (pos >= e_t_h && e_t_h != ZV) |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3211 { |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3212 Lisp_Object args[3]; |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3213 |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3214 args[0] = Qredisplay_end_trigger_functions; |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3215 XSETWINDOW (args[1], w); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3216 XSETINT (args[2], e_t_h); |
14133
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3217 |
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3218 /* Since we are *trying* to run these functions, |
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3219 don't try to run them again, even if they get an error. */ |
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3220 w->redisplay_end_trigger = Qnil; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3221 Frun_hook_with_args (3, args); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3222 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3223 e_t_h = ZV; |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3224 /* Notice if it changed the face of this character. */ |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3225 next_face_change = pos; |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3226 } |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3227 |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3228 #ifdef HAVE_FACES |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3229 /* Did we hit a face change? Figure out what face we should |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3230 use now. We also hit this the first time through the |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3231 loop, to see what face we should start with. */ |
15381
91662157e604
(redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents:
15245
diff
changeset
|
3232 if (pos >= next_face_change |
91662157e604
(redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents:
15245
diff
changeset
|
3233 && (FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f))) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3234 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3235 int limit = pos + 50; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3236 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3237 if (limit < Z && !CHAR_HEAD_P (POS_ADDR (limit))) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3238 INC_POS (limit); /* Adjust to character boundary. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3239 current_face = compute_char_face (f, w, pos, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3240 region_beg, region_end, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3241 &next_face_change, limit, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3242 } |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3243 #endif |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3244 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3245 /* Compute the next place we need to stop |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3246 and do something special; set PAUSE. */ |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3247 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3248 pause = ZV; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3249 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3250 if (pos < next_boundary && next_boundary < pause) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3251 pause = next_boundary; |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3252 if (pos < next_face_change && next_face_change < pause) |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3253 pause = next_face_change; |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3254 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3255 if (e_t_h < pause) |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3256 pause = e_t_h; |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3257 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3258 /* Wouldn't you hate to read the next line to someone over |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3259 the phone? */ |
6705 | 3260 if (pos < PT && PT < pause) |
3261 pause = PT; | |
277 | 3262 if (pos < GPT && GPT < pause) |
3263 pause = GPT; | |
3264 | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3265 p = POS_ADDR (pos); |
277 | 3266 } |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3267 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3268 if (p1 >= endp) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3269 break; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3270 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3271 p1prev = p1; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3272 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3273 if (multibyte) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3274 /* PAUSE is surely at character boundary. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3275 c = STRING_CHAR_AND_LENGTH (p, pause - pos, len), p += len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3276 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3277 c = *p++, len = 1; |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3278 /* Let a display table override all standard display methods. */ |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3279 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3280 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3281 p1 = copy_part_of_rope (f, p1, leftmargin, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3282 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3283 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3284 current_face, rev_dir_bit); |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3285 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3286 else if (c >= 040 && c < 0177) |
277 | 3287 { |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3288 if (p1 >= leftmargin) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3289 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
277 | 3290 p1++; |
3291 } | |
3292 else if (c == '\n') | |
3293 { | |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3294 #if 0 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3295 /* Same as p1prev, but after the invis_vector_contents text |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3296 (if we have that on this line). */ |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3297 GLYPH *p1prev_modified; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3298 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3299 |
277 | 3300 invis = 0; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3301 if (last_invis_skip == pos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3302 && TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (last_invis_prop)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3303 invis = 1; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3304 while (pos + 1 < ZV |
277 | 3305 && selective > 0 |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
3306 && indented_beyond_p (pos + 1, selective)) |
277 | 3307 { |
3308 invis = 1; | |
3309 pos = find_next_newline (pos + 1, 1); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3310 if (FETCH_BYTE (pos - 1) == '\n') |
277 | 3311 pos--; |
3312 } | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3313 if (invis && selective_rlen > 0 && p1 >= leftmargin) |
277 | 3314 { |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3315 #if 0 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3316 GLYPH *cs, *csend; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3317 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3318 cs = charstart + (p1 - p1start); |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3319 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3320 |
277 | 3321 p1 += selective_rlen; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3322 if (p1 - leftmargin > width) |
277 | 3323 p1 = endp; |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3324 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3325 #if 0 /* This needs more work; charstarts needs to record |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3326 both whether a position ho;ds an ellipsis character |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3327 and what buffer position it corresponds to. */ |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3328 csend = charstart + (p1 - p1start); |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3329 while (cs != csend) |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3330 *cs++ = -2; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3331 /* The idea is to use p1prev_modified instead of p1prev |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3332 in the loop below over p2x. */ |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3333 p1prev_modified = p1; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3334 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3335 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3336 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3337 (p1 - p1prev), current_face, rev_dir_bit); |
277 | 3338 } |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3339 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3340 /* Update charstarts for the newline that ended this line. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3341 /* Do nothing here for a char that's entirely off the left edge |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3342 or if it starts at the right edge. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3343 if (p1 >= leftmargin && p1prev != endp) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3344 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3345 /* Store the newline's position into charstarts |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3346 for the column where the newline starts. |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3347 Store -1 for the rest of the glyphs it occupies. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3348 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3349 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3350 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3351 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3352 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3353 *p2x++ = pos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3354 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3355 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3356 } |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3357 #ifdef HAVE_FACES |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3358 /* Draw the face of the newline character as extending all the |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3359 way to the end of the frame line. */ |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3360 if (current_face) |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3361 { |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3362 if (p1 < leftmargin) |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3363 p1 = leftmargin; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3364 while (p1 < endp) |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3365 *p1++ = FAST_MAKE_GLYPH (' ', current_face) | rev_dir_bit; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3366 } |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3367 #endif |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3368 |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3369 break; |
277 | 3370 } |
3371 else if (c == '\t') | |
3372 { | |
3373 do | |
3374 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3375 if (p1 >= leftmargin && p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3376 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit; |
277 | 3377 p1++; |
3378 } | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3379 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0)) |
277 | 3380 % tab_width); |
3381 } | |
368 | 3382 else if (c == Ctl ('M') && selective == -1) |
277 | 3383 { |
3384 pos = find_next_newline (pos, 1); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3385 if (FETCH_BYTE (pos - 1) == '\n') |
277 | 3386 pos--; |
3387 if (selective_rlen > 0) | |
3388 { | |
3389 p1 += selective_rlen; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3390 if (p1 - leftmargin > width) |
277 | 3391 p1 = endp; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3392 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3393 (p1 - p1prev), current_face, rev_dir_bit); |
277 | 3394 } |
9572 | 3395 #ifdef HAVE_FACES |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3396 /* Draw the face of the newline character as extending all the |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3397 way to the end of the frame line. */ |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3398 if (current_face) |
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3399 { |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3400 if (p1 < leftmargin) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3401 p1 = leftmargin; |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3402 while (p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3403 *p1++ = FAST_MAKE_GLYPH (' ', current_face) | rev_dir_bit; |
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3404 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3405 #endif |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3406 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3407 /* Update charstarts for the ^M that ended this line. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3408 /* Do nothing here for a char that's entirely off the left edge |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3409 or if it starts at the right edge. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3410 if (p1 >= leftmargin && p1prev != endp) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3411 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3412 /* Store the newline's position into charstarts |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3413 for the column where the newline starts. |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3414 Store -1 for the rest of the glyphs it occupies. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3415 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3416 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3417 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3418 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3419 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3420 *p2x++ = pos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3421 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3422 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3423 } |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3424 break; |
277 | 3425 } |
3426 else if (c < 0200 && ctl_arrow) | |
3427 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3428 if (p1 >= leftmargin) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3429 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3430 (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3431 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (dp))) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3432 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3433 current_face) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3434 | rev_dir_bit); |
277 | 3435 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3436 if (p1 >= leftmargin && p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3437 *p1 = MAKE_GLYPH (f, c ^ 0100, current_face) | rev_dir_bit; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3438 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3439 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3440 else if (len == 1) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3441 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3442 /* C is not a multibyte character. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3443 if (p1 >= leftmargin) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3444 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3445 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
17362
87db7dfa4a96
(display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17317
diff
changeset
|
3446 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3447 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3448 current_face) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3449 | rev_dir_bit); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3450 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3451 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3452 *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face) | rev_dir_bit; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3453 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3454 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3455 *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3456 | rev_dir_bit); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3457 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3458 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3459 *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face) | rev_dir_bit; |
277 | 3460 p1++; |
3461 } | |
3462 else | |
3463 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3464 /* C is a multibyte character. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3465 int charset = CHAR_CHARSET (c); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3466 int columns = (charset == CHARSET_COMPOSITION |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3467 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3468 : CHARSET_WIDTH (charset)); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3469 GLYPH g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3470 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3471 while (columns--) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3472 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3473 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3474 *p1 = g, g |= GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3475 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3476 } |
277 | 3477 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3478 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3479 prevpos = pos; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3480 pos += len; |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3481 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3482 /* Update charstarts for the character just output. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3483 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3484 /* Do nothing here for a char that's entirely off the left edge. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3485 if (p1 >= leftmargin) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3486 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3487 /* Store the char's position into charstarts |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3488 for the first glyph occupied by this char. |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3489 Store -1 for the rest of the glyphs it occupies. */ |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3490 if (p1 != p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3491 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3492 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3493 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3494 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3495 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3496 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3497 if (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3498 *p2x++ = prevpos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3499 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3500 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3501 } |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3502 } |
277 | 3503 } |
3504 | |
3505 val.hpos = - XINT (w->hscroll); | |
3506 if (val.hpos) | |
3507 val.hpos++; | |
3508 | |
3509 val.vpos = 1; | |
3510 | |
3511 lastpos = pos; | |
3512 | |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3513 /* Store 0 in this charstart line for the positions where |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3514 there is no character. But do leave what was recorded |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3515 for the character that ended the line. */ |
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3516 /* Add 1 in the endtest to compensate for the fact that ENDP was |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3517 made from WIDTH, which is 1 less than the window's actual |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
3518 internal width. */ |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3519 i = p1 - p1start + 1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3520 if (p1 < leftmargin) |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3521 i += leftmargin - p1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3522 for (; i < endp - p1start + 1; i++) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3523 charstart[i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3524 |
277 | 3525 /* Handle continuation in middle of a character */ |
3526 /* by backing up over it */ | |
3527 if (p1 > endp) | |
3528 { | |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3529 /* Don't back up if we never actually displayed any text. |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3530 This occurs when the minibuffer prompt takes up the whole line. */ |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3531 if (p1prev) |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3532 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3533 /* Start the next line with that same character whose |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3534 character code is C and the length of multi-byte form is |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3535 LEN. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3536 pos = prevpos; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3537 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3538 if (len == 1) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3539 /* C is not a multi-byte character. We can break it and |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3540 start from the middle column in the next line. So, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3541 adjust VAL.HPOS to skip the columns output on this |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3542 line. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3543 val.hpos += p1prev - endp; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3544 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3545 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3546 /* C is a multibyte character. Since we can't broke it |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3547 in the middle, the whole character should be driven |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3548 into the next line. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3549 /* As the result, the actual columns occupied by the |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3550 text on this line is less than WIDTH. VAL.TAB_OFFSET |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3551 must be adjusted. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3552 taboffset = taboffset + (p1prev - endp); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3553 /* Let's fill unused columns with TRUNCATOR or CONTINUER. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3554 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3555 GLYPH g = fix_glyph (f, truncate ? truncator : continuer, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3556 while (p1prev < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3557 *p1prev++ = g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3558 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3559 /* If POINT is at POS, cursor should not on this line. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3560 lastpos = pos; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3561 if (PT == pos) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3562 cursor_vpos = -1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3563 } |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3564 } |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3565 |
277 | 3566 /* Keep in this line everything up to the continuation column. */ |
3567 p1 = endp; | |
3568 } | |
3569 | |
3570 /* Finish deciding which character to start the next line on, | |
3571 and what hpos to start it at. | |
3572 Also set `lastpos' to the last position which counts as "on this line" | |
3573 for cursor-positioning. */ | |
3574 | |
3575 if (pos < ZV) | |
3576 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3577 if (FETCH_BYTE (pos) == '\n') |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3578 { |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3579 /* If stopped due to a newline, start next line after it */ |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3580 pos++; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3581 val.tab_offset = 0; |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3582 /* Check again for hidden lines, in case the newline occurred exactly |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3583 at the right margin. */ |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3584 while (pos < ZV && selective > 0 |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3585 && indented_beyond_p (pos, selective)) |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3586 pos = find_next_newline (pos, 1); |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3587 } |
277 | 3588 else |
3589 /* Stopped due to right margin of window */ | |
3590 { | |
3591 if (truncate) | |
3592 { | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3593 *p1++ = fix_glyph (f, truncator, 0); |
277 | 3594 /* Truncating => start next line after next newline, |
3595 and point is on this line if it is before the newline, | |
3596 and skip none of first char of next line */ | |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3597 do |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3598 pos = find_next_newline (pos, 1); |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3599 while (pos < ZV && selective > 0 |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3600 && indented_beyond_p (pos, selective)); |
277 | 3601 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
3602 | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3603 lastpos = pos - (FETCH_BYTE (pos - 1) == '\n'); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3604 val.tab_offset = 0; |
277 | 3605 } |
3606 else | |
3607 { | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3608 *p1++ = fix_glyph (f, continuer, 0); |
277 | 3609 val.vpos = 0; |
3610 lastpos--; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3611 val.tab_offset = taboffset + width; |
277 | 3612 } |
3613 } | |
3614 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3615 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3616 val.tab_offset = 0; |
277 | 3617 |
3618 /* If point is at eol or in invisible text at eol, | |
769 | 3619 record its frame location now. */ |
277 | 3620 |
6705 | 3621 if (start <= PT && PT <= lastpos && cursor_vpos < 0) |
277 | 3622 { |
3623 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3624 cursor_hpos = p1 - leftmargin; |
277 | 3625 } |
3626 | |
3627 if (cursor_vpos == vpos) | |
3628 { | |
3629 if (cursor_hpos < 0) cursor_hpos = 0; | |
3630 if (cursor_hpos > width) cursor_hpos = width; | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3631 cursor_hpos += WINDOW_LEFT_MARGIN (w); |
769 | 3632 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) |
277 | 3633 { |
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3634 if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (f) |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3635 && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))) |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3636 { |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3637 FRAME_CURSOR_Y (f) = cursor_vpos; |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3638 FRAME_CURSOR_X (f) = cursor_hpos; |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
3639 } |
277 | 3640 |
3641 if (w == XWINDOW (selected_window)) | |
3642 { | |
3643 /* Line is not continued and did not start | |
3644 in middle of character */ | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3645 if ((hpos - WINDOW_LEFT_MARGIN (w) |
277 | 3646 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
3647 && val.vpos) | |
3648 { | |
3649 this_line_bufpos = start; | |
3650 this_line_buffer = current_buffer; | |
3651 this_line_vpos = cursor_vpos; | |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
3652 this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w); |
277 | 3653 this_line_endpos = Z - lastpos; |
3654 } | |
3655 else | |
3656 this_line_bufpos = 0; | |
3657 } | |
3658 } | |
3659 } | |
3660 | |
3661 /* If hscroll and line not empty, insert truncation-at-left marker */ | |
3662 if (hscroll && lastpos != start) | |
3663 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3664 GLYPH g = fix_glyph (f, truncator, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3665 *leftmargin = g; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3666 if (p1 <= leftmargin) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3667 p1 = leftmargin + 1; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3668 else /* MULE: it may be a wide-column character */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3669 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3670 p1prev = leftmargin + 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3671 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3672 *p1prev++ = g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3673 } |
277 | 3674 } |
3675 | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3676 if (!WINDOW_RIGHTMOST_P (w)) |
277 | 3677 { |
3678 endp++; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3679 if (p1 < leftmargin) p1 = leftmargin; |
277 | 3680 while (p1 < endp) *p1++ = SPACEGLYPH; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3681 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
3682 /* Don't draw vertical bars if we're using scroll bars. They're |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
3683 covered up by the scroll bars, and it's distracting to see |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
3684 them when the scroll bar windows are flickering around to be |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3685 reconfigured. */ |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3686 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3687 { |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3688 int i; |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3689 for (i = 0; i < FRAME_SCROLL_BAR_COLS (f); i++) |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3690 *p1++ = SPACEGLYPH; |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3691 } |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3692 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3693 *p1++ = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) |
17362
87db7dfa4a96
(display_text_line): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17317
diff
changeset
|
3694 ? XINT (DISP_BORDER_GLYPH (dp)) |
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
3695 : '|'); |
277 | 3696 } |
3697 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], | |
3698 p1 - desired_glyphs->glyphs[vpos]); | |
3699 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
3700 | |
3701 /* If the start of this line is the overlay arrow-position, | |
3702 then put the arrow string into the display-line. */ | |
3703 | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3704 if (MARKERP (Voverlay_arrow_position) |
277 | 3705 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
3706 && start == marker_position (Voverlay_arrow_position) | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3707 && STRINGP (Voverlay_arrow_string) |
277 | 3708 && ! overlay_arrow_seen) |
3709 { | |
3710 unsigned char *p = XSTRING (Voverlay_arrow_string)->data; | |
3711 int i; | |
3712 int len = XSTRING (Voverlay_arrow_string)->size; | |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
3713 int arrow_end; |
277 | 3714 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3715 if (len > width) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3716 len = width; |
9572 | 3717 #ifdef HAVE_FACES |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3718 if (!NULL_INTERVAL_P (XSTRING (Voverlay_arrow_string)->intervals)) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3719 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3720 /* If the arrow string has text props, obey them when displaying. */ |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3721 for (i = 0; i < len; i++) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3722 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3723 int c = p[i]; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3724 Lisp_Object face, ilisp; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3725 int newface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3726 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3727 XSETFASTINT (ilisp, i); |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3728 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3729 newface = compute_glyph_face_1 (f, face, 0); |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3730 leftmargin[i] = FAST_MAKE_GLYPH (c, newface); |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3731 } |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3732 } |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3733 else |
9572 | 3734 #endif /* HAVE_FACES */ |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3735 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3736 for (i = 0; i < len; i++) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3737 leftmargin[i] = p[i]; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
3738 } |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
3739 |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
3740 /* Bug in SunOS 4.1.1 compiler requires this intermediate variable. */ |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3741 arrow_end = (leftmargin - desired_glyphs->glyphs[vpos]) + len; |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
3742 if (desired_glyphs->used[vpos] < arrow_end) |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
3743 desired_glyphs->used[vpos] = arrow_end; |
277 | 3744 |
3745 overlay_arrow_seen = 1; | |
3746 } | |
3747 | |
3748 val.bufpos = pos; | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3749 val.ovstring_chars_done = ovstr_done; |
277 | 3750 val_display_text_line = val; |
3751 return &val_display_text_line; | |
3752 } | |
3753 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3754 /* Redisplay the menu bar in the frame for window W. */ |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3755 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3756 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3757 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3758 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3759 { |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3760 Lisp_Object items, tail; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3761 register int vpos = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3762 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3763 int maxendcol = FRAME_WIDTH (f) + WINDOW_LEFT_MARGIN (w); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3764 int hpos = 0; |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3765 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3766 |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
3767 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
3768 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
3769 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
3770 #endif |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
3771 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
3772 #ifdef USE_X_TOOLKIT |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
3773 if (FRAME_X_P (f)) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3774 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
3775 #endif /* USE_X_TOOLKIT */ |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3776 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3777 get_display_line (f, vpos, 0); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3778 |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3779 items = FRAME_MENU_BAR_ITEMS (f); |
15111
6a5ae152de0d
(display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
15038
diff
changeset
|
3780 for (i = 0; i < XVECTOR (items)->size; i += 4) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3781 { |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3782 Lisp_Object pos, string; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3783 string = XVECTOR (items)->contents[i + 1]; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3784 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3785 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
3786 |
15111
6a5ae152de0d
(display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
15038
diff
changeset
|
3787 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3788 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3789 if (hpos < maxendcol) |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
3790 hpos = display_string (w, vpos, |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3791 XSTRING (string)->data, |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3792 XSTRING (string)->size, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3793 hpos, 0, 0, hpos, maxendcol, -1); |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
3794 /* Put a space between items. */ |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3795 if (hpos < maxendcol) |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3796 { |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
3797 int hpos1 = hpos + 1; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3798 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3799 min (hpos1, maxendcol), maxendcol, 0); |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3800 } |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3801 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3802 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3803 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3804 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3805 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3806 /* Fill out the line with spaces. */ |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
3807 if (maxendcol > hpos) |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3808 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, maxendcol, maxendcol, 0); |
4423
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
3809 |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
3810 /* Clear the rest of the lines allocated to the menu bar. */ |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
3811 vpos++; |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
3812 while (vpos < FRAME_MENU_BAR_LINES (f)) |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
3813 get_display_line (f, vpos++, 0); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3814 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
3815 |
277 | 3816 /* Display the mode line for window w */ |
3817 | |
3818 static void | |
3819 display_mode_line (w) | |
3820 struct window *w; | |
3821 { | |
3822 register int vpos = XFASTINT (w->height) + XFASTINT (w->top) - 1; | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3823 register int left = WINDOW_LEFT_MARGIN (w); |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3824 register int right = WINDOW_RIGHT_MARGIN (w); |
769 | 3825 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 3826 |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3827 line_number_displayed = 0; |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
3828 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3829 |
769 | 3830 get_display_line (f, vpos, left); |
11354
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3831 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3832 /* Temporarily make frame F's kboard the current kboard |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3833 so that kboard-local variables in the mode_line_format |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3834 will get the right values. */ |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3835 push_frame_kboard (f); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3836 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3837 display_mode_element (w, vpos, left, 0, right, right, |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3838 current_buffer->mode_line_format); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3839 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3840 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3841 |
769 | 3842 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
277 | 3843 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3844 /* Put the mode line in inverse video. |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3845 Use faces if possible, since that lets us handle |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3846 partial-width windows and avoid inverting the scroll bar columns. */ |
9572 | 3847 #ifdef HAVE_FACES |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3848 if (! FRAME_TERMCAP_P (f) && mode_line_inverse_video) |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3849 { |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3850 /* For a partial width window, explicitly set face of each glyph. */ |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3851 int i; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3852 unsigned int padding; |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3853 GLYPH *ptr = FRAME_DESIRED_GLYPHS (f)->glyphs[vpos]; |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3854 for (i = left; i < right; ++i) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3855 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3856 padding = ptr[i] & GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3857 ptr[i] = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (ptr[i]), 1) | padding; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3858 } |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3859 } |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3860 else |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3861 #endif |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3862 |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3863 /* Make the mode line inverse video if the entire line |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3864 is made of mode lines. |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3865 I.e. if this window is full width, |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3866 or if it is the child of a full width window |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3867 (which implies that that window is split side-by-side |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3868 and the rest of this line is mode lines of the sibling windows). */ |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3869 if (WINDOW_FULL_WIDTH_P (w) |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
3870 || WINDOW_FULL_WIDTH_P (XWINDOW (w->parent))) |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3871 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; |
277 | 3872 } |
3873 | |
3874 /* Contribute ELT to the mode line for window W. | |
3875 How it translates into text depends on its data type. | |
3876 | |
3877 VPOS is the position of the mode line being displayed. | |
3878 | |
769 | 3879 HPOS is the position (absolute on frame) where this element's text |
277 | 3880 should start. The output is truncated automatically at the right |
3881 edge of window W. | |
3882 | |
3883 DEPTH is the depth in recursion. It is used to prevent | |
3884 infinite recursion here. | |
3885 | |
3886 MINENDCOL is the hpos before which the element may not end. | |
3887 The element is padded at the right with spaces if nec | |
3888 to reach this column. | |
3889 | |
3890 MAXENDCOL is the hpos past which this element may not extend. | |
3891 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority. | |
3892 (This is necessary to make nested padding and truncation work.) | |
3893 | |
3894 Returns the hpos of the end of the text generated by ELT. | |
3895 The next element will receive that value as its HPOS arg, | |
3896 so as to concatenate the elements. */ | |
3897 | |
3898 static int | |
3899 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) | |
3900 struct window *w; | |
3901 register int vpos, hpos; | |
3902 int depth; | |
3903 int minendcol; | |
3904 register int maxendcol; | |
3905 register Lisp_Object elt; | |
3906 { | |
3907 tail_recurse: | |
3908 if (depth > 10) | |
3909 goto invalid; | |
3910 | |
3911 depth++; | |
3912 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
3913 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 3914 { |
3915 case Lisp_String: | |
3916 { | |
3917 /* A string: output it and check for %-constructs within it. */ | |
3918 register unsigned char c; | |
3919 register unsigned char *this = XSTRING (elt)->data; | |
3920 | |
3921 while (hpos < maxendcol && *this) | |
3922 { | |
3923 unsigned char *last = this; | |
3924 while ((c = *this++) != '\0' && c != '%') | |
3925 ; | |
3926 if (this - 1 != last) | |
3927 { | |
3928 register int lim = --this - last + hpos; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3929 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3930 hpos = store_frame_title (last, hpos, min (lim, maxendcol)); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3931 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3932 hpos = display_string (w, vpos, last, -1, hpos, 0, 1, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3933 hpos, min (lim, maxendcol), -1); |
277 | 3934 } |
3935 else /* c == '%' */ | |
3936 { | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3937 register int minendcol; |
277 | 3938 register int spec_width = 0; |
3939 | |
3940 /* We can't allow -ve args due to the "%-" construct */ | |
3941 /* Argument specifies minwidth but not maxwidth | |
3942 (maxwidth can be specified by | |
3943 (<negative-number> . <stuff>) mode-line elements) */ | |
3944 | |
3945 while ((c = *this++) >= '0' && c <= '9') | |
3946 { | |
3947 spec_width = spec_width * 10 + (c - '0'); | |
3948 } | |
3949 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3950 minendcol = hpos + spec_width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3951 if (minendcol > maxendcol) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3952 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3953 spec_width = maxendcol - hpos; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3954 minendcol = maxendcol; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3955 } |
277 | 3956 |
3957 if (c == 'M') | |
3958 hpos = display_mode_element (w, vpos, hpos, depth, | |
3959 spec_width, maxendcol, | |
3960 Vglobal_mode_string); | |
3961 else if (c != 0) | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3962 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3963 char *spec = decode_mode_spec (w, c, spec_width, |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3964 maxendcol - hpos); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3965 if (frame_title_ptr) |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
3966 hpos = store_frame_title (spec, minendcol, maxendcol); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3967 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3968 hpos = display_string (w, vpos, spec, -1, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3969 hpos, 0, 1, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3970 minendcol, maxendcol, -1); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3971 } |
277 | 3972 } |
3973 } | |
3974 } | |
3975 break; | |
3976 | |
3977 case Lisp_Symbol: | |
3978 /* A symbol: process the value of the symbol recursively | |
3979 as if it appeared here directly. Avoid error if symbol void. | |
3980 Special case: if value of symbol is a string, output the string | |
3981 literally. */ | |
3982 { | |
3983 register Lisp_Object tem; | |
3984 tem = Fboundp (elt); | |
485 | 3985 if (!NILP (tem)) |
277 | 3986 { |
3987 tem = Fsymbol_value (elt); | |
3988 /* If value is a string, output that string literally: | |
3989 don't check for % within it. */ | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3990 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3991 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3992 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3993 hpos = store_frame_title (XSTRING (tem)->data, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3994 minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3995 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3996 hpos = display_string (w, vpos, XSTRING (tem)->data, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3997 XSTRING (tem)->size, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3998 hpos, 0, 1, minendcol, maxendcol, -1); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3999 } |
277 | 4000 /* Give up right away for nil or t. */ |
4001 else if (!EQ (tem, elt)) | |
4002 { elt = tem; goto tail_recurse; } | |
4003 } | |
4004 } | |
4005 break; | |
4006 | |
4007 case Lisp_Cons: | |
4008 { | |
4009 register Lisp_Object car, tem; | |
4010 | |
4011 /* A cons cell: three distinct cases. | |
4012 If first element is a string or a cons, process all the elements | |
4013 and effectively concatenate them. | |
4014 If first element is a negative number, truncate displaying cdr to | |
4015 at most that many characters. If positive, pad (with spaces) | |
4016 to at least that many characters. | |
4017 If first element is a symbol, process the cadr or caddr recursively | |
4018 according to whether the symbol's value is non-nil or nil. */ | |
4019 car = XCONS (elt)->car; | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4020 if (SYMBOLP (car)) |
277 | 4021 { |
4022 tem = Fboundp (car); | |
4023 elt = XCONS (elt)->cdr; | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4024 if (!CONSP (elt)) |
277 | 4025 goto invalid; |
4026 /* elt is now the cdr, and we know it is a cons cell. | |
4027 Use its car if CAR has a non-nil value. */ | |
485 | 4028 if (!NILP (tem)) |
277 | 4029 { |
4030 tem = Fsymbol_value (car); | |
485 | 4031 if (!NILP (tem)) |
277 | 4032 { elt = XCONS (elt)->car; goto tail_recurse; } |
4033 } | |
4034 /* Symbol's value is nil (or symbol is unbound) | |
4035 Get the cddr of the original list | |
4036 and if possible find the caddr and use that. */ | |
4037 elt = XCONS (elt)->cdr; | |
485 | 4038 if (NILP (elt)) |
277 | 4039 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4040 else if (!CONSP (elt)) |
277 | 4041 goto invalid; |
4042 elt = XCONS (elt)->car; | |
4043 goto tail_recurse; | |
4044 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4045 else if (INTEGERP (car)) |
277 | 4046 { |
4047 register int lim = XINT (car); | |
4048 elt = XCONS (elt)->cdr; | |
4049 if (lim < 0) | |
4050 /* Negative int means reduce maximum width. | |
4051 DO NOT change MINENDCOL here! | |
4052 (20 -10 . foo) should truncate foo to 10 col | |
4053 and then pad to 20. */ | |
4054 maxendcol = min (maxendcol, hpos - lim); | |
4055 else if (lim > 0) | |
4056 { | |
4057 /* Padding specified. Don't let it be more than | |
4058 current maximum. */ | |
4059 lim += hpos; | |
4060 if (lim > maxendcol) | |
4061 lim = maxendcol; | |
4062 /* If that's more padding than already wanted, queue it. | |
4063 But don't reduce padding already specified even if | |
4064 that is beyond the current truncation point. */ | |
4065 if (lim > minendcol) | |
4066 minendcol = lim; | |
4067 } | |
4068 goto tail_recurse; | |
4069 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4070 else if (STRINGP (car) || CONSP (car)) |
277 | 4071 { |
4072 register int limit = 50; | |
4073 /* LIMIT is to protect against circular lists. */ | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4074 while (CONSP (elt) && --limit > 0 |
277 | 4075 && hpos < maxendcol) |
4076 { | |
4077 hpos = display_mode_element (w, vpos, hpos, depth, | |
4078 hpos, maxendcol, | |
4079 XCONS (elt)->car); | |
4080 elt = XCONS (elt)->cdr; | |
4081 } | |
4082 } | |
4083 } | |
4084 break; | |
4085 | |
4086 default: | |
4087 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4088 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4089 hpos = store_frame_title ("*invalid*", minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4090 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4091 hpos = display_string (w, vpos, "*invalid*", -1, hpos, 0, 1, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4092 minendcol, maxendcol, 0); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4093 return hpos; |
277 | 4094 } |
4095 | |
4096 if (minendcol > hpos) | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4097 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4098 hpos = store_frame_title ("", minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4099 else |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4100 hpos = display_string (w, vpos, "", 0, hpos, |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4101 0, 1, minendcol, maxendcol, 0); |
277 | 4102 return hpos; |
4103 } | |
4104 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4105 /* Write a null-terminated, right justified decimal representation of |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4106 the positive integer D to BUF using a minimal field width WIDTH. */ |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4107 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4108 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4109 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4110 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4111 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4112 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4113 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4114 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4115 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4116 if (d <= 0) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4117 *p++ = '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4118 else |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4119 while (d > 0) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4120 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4121 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4122 d /= 10; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4123 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4124 for (width -= (int) (p - buf); width > 0; --width) *p++ = ' '; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4125 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4126 while (p > buf) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4127 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4128 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4129 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4130 *p-- = d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4131 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4132 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4133 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4134 /* Set a mnemonic character for CODING_SYSTEM (Lisp symbol) in BUF. |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4135 If EOL_FLAG is 1, set also a mnemonic character for end-of-line |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4136 type of CODING_SYSTEM. Return updated pointer into BUF. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4137 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4138 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4139 decode_mode_spec_coding (coding_system, buf, eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4140 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4141 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4142 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4143 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4144 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4145 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4146 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4147 val = coding_system; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4148 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4149 if (NILP (val)) /* Not yet decided. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4150 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4151 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4152 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
4153 if (eol_flag) |
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
4154 *buf++ = eol_mnemonic_undecided; |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4155 /* Don't mention EOL conversion if it isn't decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4156 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4157 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4158 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4159 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4160 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4161 eolvalue = Fget (coding_system, Qeol_type); |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4162 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4163 while (!NILP (val) && SYMBOLP (val)) |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4164 { |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4165 val = Fget (val, Qcoding_system); |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4166 if (NILP (eolvalue)) |
18834
a4b74a7b692a
(decode_mode_spec_coding): Fix typo; use `val' instead of `coding-system'.
Richard M. Stallman <rms@gnu.org>
parents:
18829
diff
changeset
|
4167 eolvalue = Fget (val, Qeol_type); |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4168 } |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4169 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4170 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4171 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4172 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4173 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4174 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4175 /* The EOL conversion we are using. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4176 int eoltype; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4177 /* The EOL conversion that is normal on this system. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4178 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4179 if (NILP (eolvalue)) /* Not yet decided. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4180 eoltype = eol_mnemonic_undecided; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4181 else if (VECTORP (eolvalue)) /* Not yet decided. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4182 eoltype = eol_mnemonic_undecided; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4183 else /* INTEGERP (eolvalue) -- 0:LF, 1:CRLF, 2:CR */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4184 eoltype = (XFASTINT (eolvalue) == 0 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4185 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4186 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4187 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4188 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4189 /* Mention the EOL conversion if it is not the usual one. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4190 *buf++ = eoltype; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4191 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4192 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4193 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4194 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4195 |
277 | 4196 /* Return a string for the output of a mode line %-spec for window W, |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4197 generated by character C. SPEC_WIDTH is the field width when |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4198 padding to the left (%c, %l). The value returned from this |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4199 function will later be truncated to width MAXWIDTH. */ |
277 | 4200 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4201 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------"; |
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4202 |
277 | 4203 static char * |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4204 decode_mode_spec (w, c, spec_width, maxwidth) |
277 | 4205 struct window *w; |
4206 register char c; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4207 register int spec_width; |
277 | 4208 register int maxwidth; |
4209 { | |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4210 Lisp_Object obj; |
769 | 4211 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
4212 char *decode_mode_spec_buf = (char *) FRAME_TEMP_GLYPHS (f)->total_contents; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4213 struct buffer *b = XBUFFER (w->buffer); |
277 | 4214 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4215 obj = Qnil; |
769 | 4216 if (maxwidth > FRAME_WIDTH (f)) |
4217 maxwidth = FRAME_WIDTH (f); | |
277 | 4218 |
4219 switch (c) | |
4220 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4221 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4222 if (!NILP (b->read_only)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4223 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4224 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4225 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4226 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4227 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4228 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4229 /* This differs from %* only for a modified read-only buffer. */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4230 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4231 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4232 if (!NILP (b->read_only)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4233 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4234 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4235 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4236 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4237 /* This differs from %* in ignoring read-only-ness. */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4238 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4239 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4240 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4241 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4242 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4243 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4244 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4245 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4246 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4247 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4248 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4249 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4250 if (command_loop_level > 5) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4251 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4252 p = decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4253 for (i = 0; i < command_loop_level; i++) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4254 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4255 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4256 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4257 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4258 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4259 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4260 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4261 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4262 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4263 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4264 if (command_loop_level > 5) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4265 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4266 p = decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4267 for (i = 0; i < command_loop_level; i++) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4268 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4269 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4270 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4271 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4272 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4273 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4274 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4275 register char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4276 register int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4277 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4278 if (maxwidth < sizeof (lots_of_dashes)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4279 return lots_of_dashes; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4280 else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4281 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4282 for (p = decode_mode_spec_buf, i = maxwidth; i > 0; i--) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4283 *p++ = '-'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4284 *p = '\0'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4285 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4286 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4287 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4288 |
277 | 4289 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4290 obj = b->name; |
277 | 4291 #if 0 |
4292 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth) | |
4293 { | |
4294 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1); | |
4295 decode_mode_spec_buf[maxwidth - 1] = '\\'; | |
4296 decode_mode_spec_buf[maxwidth] = '\0'; | |
4297 return decode_mode_spec_buf; | |
4298 } | |
4299 #endif | |
4300 break; | |
4301 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4302 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4303 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4304 int col = current_column (); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4305 XSETFASTINT (w->column_number_displayed, col); |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4306 pint2str (decode_mode_spec_buf, spec_width, col); |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4307 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4308 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4309 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4310 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4311 /* %F displays the frame name. */ |
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4312 if (!NILP (f->title)) |
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4313 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
4314 if (f->explicit_name || ! FRAME_WINDOW_P (f)) |
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4315 return (char *) XSTRING (f->name)->data; |
12348
7d39ee7e0ca3
(decode_mode_spec) [!MULTI_FRAME]: Handle %F properly.
Richard M. Stallman <rms@gnu.org>
parents:
12293
diff
changeset
|
4316 return "Emacs"; |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4317 |
277 | 4318 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4319 obj = b->filename; |
277 | 4320 #if 0 |
485 | 4321 if (NILP (obj)) |
277 | 4322 return "[none]"; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4323 else if (STRINGP (obj) && XSTRING (obj)->size > maxwidth) |
277 | 4324 { |
4325 bcopy ("...", decode_mode_spec_buf, 3); | |
4326 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3, | |
4327 decode_mode_spec_buf + 3, maxwidth - 3); | |
4328 return decode_mode_spec_buf; | |
4329 } | |
4330 #endif | |
4331 break; | |
4332 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4333 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4334 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4335 int startpos = marker_position (w->start); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4336 int line, linepos, topline; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4337 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4338 Lisp_Object tem; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4339 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4340 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4341 /* If we decided that this buffer isn't suitable for line numbers, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4342 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4343 if (EQ (w->base_line_pos, w->buffer)) |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4344 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4345 /* But do forget it, if the window shows a different buffer now. */ |
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4346 else if (BUFFERP (w->base_line_pos)) |
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4347 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4348 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4349 /* If the buffer is very big, don't waste time. */ |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4350 if (BUF_ZV (b) - BUF_BEGV (b) > line_number_display_limit) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4351 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4352 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4353 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4354 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4355 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4356 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4357 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4358 && !NILP (w->base_line_pos) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4359 && XFASTINT (w->base_line_pos) <= marker_position (w->start)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4360 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4361 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4362 linepos = XFASTINT (w->base_line_pos); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4363 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4364 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4365 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4366 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4367 linepos = BUF_BEGV (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4368 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4369 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4370 /* Count lines from base line to window start position. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4371 nlines = display_count_lines (linepos, startpos, startpos, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4372 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4373 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4374 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4375 /* Determine a new base line, if the old one is too close |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4376 or too far away, or if we did not have one. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4377 "Too close" means it's plausible a scroll-down would |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4378 go back past it. */ |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4379 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4380 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4381 XSETFASTINT (w->base_line_number, topline); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4382 XSETFASTINT (w->base_line_pos, BUF_BEGV (b)); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4383 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4384 else if (nlines < height + 25 || nlines > height * 3 + 50 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4385 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4386 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4387 int limit = BUF_BEGV (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4388 int position; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4389 int distance = (height * 2 + 30) * 200; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4390 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4391 if (startpos - distance > limit) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4392 limit = startpos - distance; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4393 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4394 nlines = display_count_lines (startpos, limit, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4395 -(height * 2 + 30), |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4396 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4397 /* If we couldn't find the lines we wanted within |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4398 200 chars per line, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4399 give up on line numbers for this window. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4400 if (position == startpos - distance) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4401 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4402 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4403 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4404 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4405 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4406 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4407 XSETFASTINT (w->base_line_number, topline - nlines); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4408 XSETFASTINT (w->base_line_pos, position); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4409 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4410 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4411 /* Now count lines from the start pos to point. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4412 nlines = display_count_lines (startpos, PT, PT, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4413 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4414 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4415 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4416 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4417 /* Make the string to show. */ |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4418 pint2str (decode_mode_spec_buf, spec_width, topline + nlines); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4419 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4420 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4421 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4422 char* p = decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4423 for (spec_width -= 2; spec_width > 0; --spec_width) *p++ = ' '; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4424 strcpy (p, "??"); |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4425 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4426 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4427 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4428 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4429 |
277 | 4430 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4431 obj = b->mode_name; |
277 | 4432 break; |
4433 | |
4434 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4435 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 4436 return " Narrow"; |
4437 break; | |
4438 | |
4439 case 'p': | |
4440 { | |
4441 int pos = marker_position (w->start); | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4442 int total = BUF_ZV (b) - BUF_BEGV (b); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4443 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4444 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 4445 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4446 if (pos <= BUF_BEGV (b)) |
277 | 4447 return "All"; |
4448 else | |
4449 return "Bottom"; | |
4450 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4451 else if (pos <= BUF_BEGV (b)) |
277 | 4452 return "Top"; |
4453 else | |
4454 { | |
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4455 if (total > 1000000) |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4456 /* Do it differently for a large value, to avoid overflow. */ |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4457 total = ((pos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4458 else |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4459 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 4460 /* We can't normally display a 3-digit number, |
4461 so get us a 2-digit number that is close. */ | |
4462 if (total == 100) | |
4463 total = 99; | |
4464 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
4465 return decode_mode_spec_buf; | |
4466 } | |
4467 } | |
4468 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4469 /* Display percentage of size above the bottom of the screen. */ |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4470 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4471 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4472 int toppos = marker_position (w->start); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4473 int botpos = BUF_Z (b) - XFASTINT (w->window_end_pos); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4474 int total = BUF_ZV (b) - BUF_BEGV (b); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4475 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4476 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4477 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4478 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4479 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4480 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4481 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4482 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4483 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4484 { |
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4485 if (total > 1000000) |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4486 /* Do it differently for a large value, to avoid overflow. */ |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4487 total = ((botpos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4488 else |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
4489 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total; |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4490 /* We can't normally display a 3-digit number, |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4491 so get us a 2-digit number that is close. */ |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4492 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4493 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4494 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4495 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4496 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4497 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4498 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4499 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4500 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4501 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4502 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4503 /* status of process */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4504 obj = Fget_buffer_process (w->buffer); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4505 if (NILP (obj)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4506 return "no process"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4507 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4508 obj = Fsymbol_name (Fprocess_status (obj)); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4509 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4510 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4511 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4512 case 't': /* indicate TEXT or BINARY */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4513 #ifdef MODE_LINE_BINARY_TEXT |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4514 return MODE_LINE_BINARY_TEXT (b); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4515 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4516 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4517 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4518 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4519 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4520 /* coding-system (not including end-of-line format) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4521 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4522 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4523 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4524 int eol_flag = (c == 'Z'); |
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
4525 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4526 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
4527 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4528 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4529 /* No need to mention EOL here--the terminal never needs |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4530 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4531 p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0); |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4532 p = decode_mode_spec_coding (terminal_coding.symbol, p, 0); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4533 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
4534 p = decode_mode_spec_coding (b->buffer_file_coding_system, |
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
4535 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
4536 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4537 #if 0 /* This proves to be annoying; I think we can do without. -- rms. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4538 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4539 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4540 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4541 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4542 p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4543 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4544 p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4545 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4546 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4547 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4548 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4549 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4550 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4551 } |
277 | 4552 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4553 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4554 if (STRINGP (obj)) |
277 | 4555 return (char *) XSTRING (obj)->data; |
4556 else | |
4557 return ""; | |
4558 } | |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4559 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4560 /* Search for COUNT instances of a line boundary, which means either a |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4561 newline or (if selective display enabled) a carriage return. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4562 Start at START. If COUNT is negative, search backwards. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4563 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4564 If we find COUNT instances, set *SHORTAGE to zero, and return the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4565 position after the COUNTth match. Note that for reverse motion |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4566 this is not the same as the usual convention for Emacs motion commands. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4567 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4568 If we don't find COUNT instances before reaching the end of the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4569 buffer (or the beginning, if scanning backwards), set *SHORTAGE to |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4570 the number of line boundaries left unfound, and return the end of the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4571 buffer we bumped up against. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4572 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4573 static int |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4574 display_scan_buffer (start, count, shortage) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4575 int *shortage, start; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4576 register int count; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4577 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4578 int limit = ((count > 0) ? ZV - 1 : BEGV); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4579 int direction = ((count > 0) ? 1 : -1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4580 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4581 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4582 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4583 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4584 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4585 register unsigned char *ceiling_addr; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4586 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4587 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4588 check only for newlines. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4589 if (! (!NILP (current_buffer->selective_display) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4590 && !INTEGERP (current_buffer->selective_display))) |
9451
bdad001a9b91
(display_scan_buffer): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
9420
diff
changeset
|
4591 return scan_buffer ('\n', start, 0, count, shortage, 0); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4592 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4593 /* The code that follows is like scan_buffer |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4594 but checks for either newline or carriage return. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4595 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4596 if (shortage != 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4597 *shortage = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4598 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4599 if (count > 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4600 while (start != limit + 1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4601 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4602 ceiling = BUFFER_CEILING_OF (start); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4603 ceiling = min (limit, ceiling); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4604 ceiling_addr = POS_ADDR (ceiling) + 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4605 base = (cursor = POS_ADDR (start)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4606 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4607 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4608 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4609 ; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4610 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4611 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4612 if (--count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4613 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4614 immediate_quit = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4615 return (start + cursor - base + 1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4616 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4617 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4618 if (++cursor == ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4619 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4620 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4621 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4622 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4623 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4624 start += cursor - base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4625 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4626 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4627 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4628 start--; /* first character we scan */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4629 while (start > limit - 1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4630 { /* we WILL scan under start */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4631 ceiling = BUFFER_FLOOR_OF (start); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4632 ceiling = max (limit, ceiling); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4633 ceiling_addr = POS_ADDR (ceiling) - 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4634 base = (cursor = POS_ADDR (start)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4635 cursor++; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4636 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4637 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4638 while (--cursor != ceiling_addr |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4639 && *cursor != '\n' && *cursor != 015) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4640 ; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4641 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4642 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4643 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4644 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4645 immediate_quit = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4646 return (start + cursor - base + 1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4647 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4648 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4649 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4650 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4651 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4652 start += cursor - base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4653 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4654 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4655 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4656 if (shortage != 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4657 *shortage = count * direction; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4658 return (start + ((direction == 1 ? 0 : 1))); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4659 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4660 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4661 /* Count up to N lines starting from FROM. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4662 But don't go beyond LIMIT. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4663 Return the number of lines thus found (always positive). |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4664 Store the position after what was found into *POS_PTR. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4665 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4666 static int |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4667 display_count_lines (from, limit, n, pos_ptr) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4668 int from, limit, n; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4669 int *pos_ptr; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4670 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4671 int oldbegv = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4672 int oldzv = ZV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4673 int shortage = 0; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4674 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4675 if (limit < from) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4676 BEGV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4677 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4678 ZV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4679 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
4680 *pos_ptr = display_scan_buffer (from, n, &shortage); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4681 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4682 ZV = oldzv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4683 BEGV = oldbegv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4684 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4685 if (n < 0) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4686 /* When scanning backwards, scan_buffer stops *after* the last newline |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4687 it finds, but does count it. Compensate for that. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4688 return - n - shortage - (*pos_ptr != limit); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4689 return n - shortage; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4690 } |
277 | 4691 |
4692 /* Display STRING on one line of window W, starting at HPOS. | |
4693 Display at position VPOS. Caller should have done get_display_line. | |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4694 If VPOS == -1, display it as the current frame's title. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4695 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated. |
277 | 4696 |
4697 TRUNCATE is GLYPH to display at end if truncated. Zero for none. | |
4698 | |
4699 MINCOL is the first column ok to end at. (Pad with spaces to this col.) | |
4700 MAXCOL is the last column ok to end at. Truncate here. | |
4701 -1 for MINCOL or MAXCOL means no explicit minimum or maximum. | |
769 | 4702 Both count from the left edge of the frame, as does HPOS. |
277 | 4703 The right edge of W is an implicit maximum. |
4704 If TRUNCATE is nonzero, the implicit maximum is one column before the edge. | |
4705 | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4706 OBEY_WINDOW_WIDTH says to put spaces or vertical bars |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4707 at the place where the current window ends in this line |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4708 and not display anything beyond there. Otherwise, only MAXCOL |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4709 controls where to stop output. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4710 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4711 MULTIBYTE can be 0 meaning do not display multibyte chars, |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4712 1 meaning do display them, or -1 meaning obey the current buffer's |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4713 value of enable_multibyte_characters. |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4714 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4715 Returns ending hpos. */ |
277 | 4716 |
4717 static int | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4718 display_string (w, vpos, string, length, hpos, truncate, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4719 obey_window_width, mincol, maxcol, multibyte) |
277 | 4720 struct window *w; |
4721 unsigned char *string; | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4722 int length; |
277 | 4723 int vpos, hpos; |
4724 GLYPH truncate; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4725 int obey_window_width; |
277 | 4726 int mincol, maxcol; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4727 int multibyte; |
277 | 4728 { |
4729 register int c; | |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4730 int truncated; |
277 | 4731 register GLYPH *p1; |
4732 int hscroll = XINT (w->hscroll); | |
1600
775c2ab9800f
* xdisp.c (display_string): Use w's buffer's value of
Jim Blandy <jimb@redhat.com>
parents:
1527
diff
changeset
|
4733 int tab_width = XINT (XBUFFER (w->buffer)->tab_width); |
277 | 4734 register GLYPH *start; |
4735 register GLYPH *end; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4736 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4737 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 4738 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos; |
4739 int window_width = XFASTINT (w->width); | |
4740 | |
4741 /* Use the standard display table, not the window's display table. | |
4742 We don't want the mode line in rot13. */ | |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
4743 register struct Lisp_Char_Table *dp = 0; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
4744 int i; |
277 | 4745 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4746 if (multibyte == -1) |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4747 multibyte = !NILP (current_buffer->enable_multibyte_characters); |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4748 /* Now multibyte is 1 if we should display multibyte characters. */ |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4749 |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
4750 if (DISP_TABLE_P (Vstandard_display_table)) |
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
4751 dp = XCHAR_TABLE (Vstandard_display_table); |
277 | 4752 |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
4753 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 4754 |
4755 p1 = p1start; | |
18852
ab7fae992236
(display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents:
18834
diff
changeset
|
4756 start = desired_glyphs->glyphs[vpos]; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4757 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4758 if (obey_window_width) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4759 { |
18852
ab7fae992236
(display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents:
18834
diff
changeset
|
4760 start += XFASTINT (w->left); |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4761 end = start + window_width - (truncate != 0); |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4762 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4763 if (!WINDOW_RIGHTMOST_P (w)) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4764 { |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4765 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4766 { |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4767 int i; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4768 |
8943
a9e40d478857
(display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
4769 for (i = 0; i < FRAME_SCROLL_BAR_COLS (f); i++) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4770 *end-- = ' '; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4771 } |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4772 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4773 *end-- = '|'; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4774 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4775 } |
277 | 4776 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4777 if (! obey_window_width |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4778 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol)) |
277 | 4779 end = desired_glyphs->glyphs[vpos] + maxcol; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4780 |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
4781 /* Store 0 in charstart for these columns. */ |
6704
a00c6f4747be
(display_string): Allow for negative hpos when clearing array.
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
4782 for (i = (hpos >= 0 ? hpos : 0); i < end - p1start + hpos; i++) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
4783 desired_glyphs->charstarts[vpos][i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
4784 |
277 | 4785 if (maxcol >= 0 && mincol > maxcol) |
4786 mincol = maxcol; | |
4787 | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4788 if (length < 0) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4789 /* We need this value for multibyte characters. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4790 length = strlen (string); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4791 |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4792 /* We set truncated to 1 if we get stopped by trying to pass END |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4793 (that is, trying to pass MAXCOL.) */ |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4794 truncated = 0; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4795 while (1) |
277 | 4796 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4797 int len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4798 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4799 if (length <= 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4800 break; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4801 if (multibyte) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4802 c = STRING_CHAR_AND_LENGTH (string, length, len); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4803 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4804 c = *string, len = 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4805 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4806 string += len, length -= len; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4807 |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4808 if (p1 >= end) |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4809 { |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4810 truncated = 1; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4811 break; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4812 } |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4813 |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4814 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4815 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4816 p1 = copy_part_of_rope (f, p1, start, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4817 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4818 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4819 0); |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4820 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
4821 else if (c >= 040 && c < 0177) |
277 | 4822 { |
4823 if (p1 >= start) | |
4824 *p1 = c; | |
4825 p1++; | |
4826 } | |
4827 else if (c == '\t') | |
4828 { | |
4829 do | |
4830 { | |
4831 if (p1 >= start && p1 < end) | |
4832 *p1 = SPACEGLYPH; | |
4833 p1++; | |
4834 } | |
4835 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width); | |
4836 } | |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4837 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow)) |
277 | 4838 { |
4839 if (p1 >= start) | |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4840 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4841 (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4842 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (dp))) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4843 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4844 0)); |
277 | 4845 p1++; |
368 | 4846 if (p1 >= start && p1 < end) |
277 | 4847 *p1 = c ^ 0100; |
4848 p1++; | |
4849 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4850 else if (len == 1) |
277 | 4851 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4852 /* C is a control character or a binary byte data. */ |
277 | 4853 if (p1 >= start) |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4854 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4855 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4856 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4857 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
4858 0)); |
277 | 4859 p1++; |
368 | 4860 if (p1 >= start && p1 < end) |
277 | 4861 *p1 = (c >> 6) + '0'; |
4862 p1++; | |
368 | 4863 if (p1 >= start && p1 < end) |
277 | 4864 *p1 = (7 & (c >> 3)) + '0'; |
4865 p1++; | |
368 | 4866 if (p1 >= start && p1 < end) |
277 | 4867 *p1 = (7 & c) + '0'; |
4868 p1++; | |
4869 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4870 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4871 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4872 /* C is a multibyte character. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4873 int charset = CHAR_CHARSET (c); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4874 int columns = (charset == CHARSET_COMPOSITION |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4875 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4876 : CHARSET_WIDTH (charset)); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4877 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4878 if (p1 < start) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4879 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4880 /* Since we can't show the left part of C, fill all |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4881 columns with spaces. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4882 columns -= start - p1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4883 p1 = start; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4884 while (columns--) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4885 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4886 if (p1 < end) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4887 *p1 = SPACEGLYPH; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4888 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4889 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4890 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4891 else if (p1 + columns > end) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4892 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4893 /* Since we can't show the right part of C, fill all |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4894 columns with TRUNCATE if TRUNCATE is specified. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4895 if (truncate) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4896 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4897 while (p1 < end) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4898 *p1++ = fix_glyph (f, truncate, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4899 /* And tell the line is truncated. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4900 truncated = 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4901 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4902 break; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4903 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4904 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4905 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4906 /* We can show the whole glyph of C. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4907 *p1++ = c; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4908 while (--columns) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4909 *p1++ = c | GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4910 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4911 } |
277 | 4912 } |
4913 | |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
4914 if (truncated) |
277 | 4915 { |
4916 p1 = end; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4917 if (truncate) *p1++ = fix_glyph (f, truncate, 0); |
277 | 4918 } |
4919 else if (mincol >= 0) | |
4920 { | |
4921 end = desired_glyphs->glyphs[vpos] + mincol; | |
4922 while (p1 < end) | |
4923 *p1++ = SPACEGLYPH; | |
4924 } | |
4925 | |
4926 { | |
4927 register int len = p1 - desired_glyphs->glyphs[vpos]; | |
4928 | |
4929 if (len > desired_glyphs->used[vpos]) | |
4930 desired_glyphs->used[vpos] = len; | |
4931 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
4932 | |
4933 return len; | |
4934 } | |
4935 } | |
4936 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4937 /* This is like a combination of memq and assq. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4938 Return 1 if PROPVAL appears as an element of LIST |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4939 or as the car of an element of LIST. |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4940 If PROPVAL is a list, compare each element against LIST |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4941 in that way, and return 1 if any element of PROPVAL is found in LIST. |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4942 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4943 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4944 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4945 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4946 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4947 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4948 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4949 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4950 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4951 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4952 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4953 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4954 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4955 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4956 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4957 if (CONSP (tem) && EQ (propval, XCONS (tem)->car)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4958 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4959 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4960 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4961 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4962 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4963 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4964 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4965 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4966 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4967 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4968 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4969 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4970 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4971 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4972 if (CONSP (tem) && EQ (propelt, XCONS (tem)->car)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4973 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4974 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4975 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4976 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4977 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4978 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4979 /* Return 1 if PROPVAL appears as the car of an element of LIST |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4980 and the cdr of that element is non-nil. |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4981 If PROPVAL is a list, check each element of PROPVAL in that way, |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4982 and the first time some element is found, |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4983 return 1 if the cdr of that element is non-nil. |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4984 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4985 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4986 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4987 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4988 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4989 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4990 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4991 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4992 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4993 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4994 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4995 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
4996 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4997 if (CONSP (tem) && EQ (propval, XCONS (tem)->car)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4998 return ! NILP (XCONS (tem)->cdr); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
4999 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5000 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5001 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5002 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5003 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5004 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5005 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5006 for (tail = list; CONSP (tail); tail = XCONS (tail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5007 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5008 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5009 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5010 if (CONSP (tem) && EQ (propelt, XCONS (tem)->car)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5011 return ! NILP (XCONS (tem)->cdr); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5012 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5013 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5014 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5015 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5016 |
277 | 5017 void |
5018 syms_of_xdisp () | |
5019 { | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5020 staticpro (&Qmenu_bar_update_hook); |
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5021 Qmenu_bar_update_hook = intern ("menu-bar-update-hook"); |
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5022 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
5023 staticpro (&Qoverriding_terminal_local_map); |
12267 | 5024 Qoverriding_terminal_local_map = intern ("overriding-terminal-local-map"); |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
5025 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5026 staticpro (&Qoverriding_local_map); |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5027 Qoverriding_local_map = intern ("overriding-local-map"); |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5028 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5029 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5030 Qwindow_scroll_functions = intern ("window-scroll-functions"); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5031 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5032 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5033 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
5034 |
277 | 5035 staticpro (&last_arrow_position); |
5036 staticpro (&last_arrow_string); | |
5037 last_arrow_position = Qnil; | |
5038 last_arrow_string = Qnil; | |
5039 | |
5040 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, | |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
5041 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 5042 Vglobal_mode_string = Qnil; |
5043 | |
5044 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
5045 "Marker for where to display an arrow on top of the buffer text.\n\ | |
5046 This must be the beginning of a line in order to work.\n\ | |
5047 See also `overlay-arrow-string'."); | |
5048 Voverlay_arrow_position = Qnil; | |
5049 | |
5050 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
5051 "String to display as an arrow. See also `overlay-arrow-position'."); | |
5052 Voverlay_arrow_string = Qnil; | |
5053 | |
5054 DEFVAR_INT ("scroll-step", &scroll_step, | |
5055 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 5056 If that fails to bring point back on frame, point is centered instead.\n\ |
5057 If this is zero, point is always centered after it moves off frame."); | |
277 | 5058 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5059 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5060 "*Scroll up to this many lines, to bring point back on screen."); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5061 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5062 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5063 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5064 "*Number of lines of margin at the top and bottom of a window.\n\ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5065 Recenter the window whenever point gets within this many lines\n\ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5066 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5067 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5068 |
277 | 5069 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
5070 | |
5071 DEFVAR_BOOL ("truncate-partial-width-windows", | |
5072 &truncate_partial_width_windows, | |
769 | 5073 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 5074 truncate_partial_width_windows = 1; |
5075 | |
5076 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
5077 "*Non-nil means use inverse video for the mode line."); | |
5078 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5079 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5080 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5081 "*Maximum buffer size for which line number should be displayed."); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5082 line_number_display_limit = 1000000; |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5083 |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5084 DEFVAR_BOOL ("highlight-nonselected-windows", &highlight_nonselected_windows, |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5085 "*Non-nil means highlight region even in nonselected windows."); |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
5086 highlight_nonselected_windows = 0; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5087 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5088 DEFVAR_BOOL ("multiple-frames", &multiple_frames, |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
5089 "Non-nil if more than one frame is visible on this display.\n\ |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
5090 Minibuffer-only frames don't count, but iconified frames do.\n\ |
12684
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
5091 This variable is not guaranteed to be accurate except while processing\n\ |
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
5092 `frame-title-format' and `icon-title-format'."); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5093 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5094 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5095 "Template for displaying the titlebar of visible frames.\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5096 \(Assuming the window manager supports this feature.)\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5097 This variable has the same structure as `mode-line-format' (which see),\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5098 and is used only on frames for which no explicit name has been set\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5099 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5100 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5101 "Template for displaying the titlebar of an iconified frame.\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5102 \(Assuming the window manager supports this feature.)\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5103 This variable has the same structure as `mode-line-format' (which see),\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5104 and is used only on frames for which no explicit name has been set\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5105 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5106 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5107 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5108 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5109 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5110 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5111 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5112 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5113 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5114 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5115 Qnil))); |
10393 | 5116 |
5117 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
5118 "Maximum number of lines to keep in the message log buffer.\n\ | |
5119 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
5120 the buffer when it becomes large."); | |
5121 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5122 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5123 DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions, |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5124 "Functions called before redisplay, if window sizes have changed.\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5125 The value should be a list of functions that take one argument.\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5126 Just before redisplay, for each frame, if any of its windows have changed\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5127 size since the last redisplay, or have been split or deleted,\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5128 all the functions in the list are called, with the frame as argument."); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5129 Vwindow_size_change_functions = Qnil; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5130 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5131 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
5132 "List of Functions to call before redisplaying a window with scrolling.\n\ |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5133 Each function is called with two arguments, the window\n\ |
13196
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
5134 and its new display-start position. Note that the value of `window-end'\n\ |
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
5135 is not valid when these functions are called."); |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5136 Vwindow_scroll_functions = Qnil; |
277 | 5137 } |
5138 | |
5139 /* initialize the window system */ | |
5140 init_xdisp () | |
5141 { | |
5142 Lisp_Object root_window; | |
5143 #ifndef COMPILER_REGISTER_BUG | |
5144 register | |
5145 #endif /* COMPILER_REGISTER_BUG */ | |
5146 struct window *mini_w; | |
5147 | |
5148 this_line_bufpos = 0; | |
5149 | |
5150 mini_w = XWINDOW (minibuf_window); | |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
5151 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 5152 |
5153 echo_area_glyphs = 0; | |
5154 previous_echo_glyphs = 0; | |
5155 | |
5156 if (!noninteractive) | |
5157 { | |
769 | 5158 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
18458
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5159 XSETFASTINT (XWINDOW (root_window)->top, FRAME_MENU_BAR_LINES (f)); |
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5160 set_window_height (root_window, |
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5161 FRAME_HEIGHT (f) - 1 - FRAME_MENU_BAR_LINES (f), |
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
5162 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5163 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 5164 set_window_height (minibuf_window, 1, 0); |
5165 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5166 XSETFASTINT (XWINDOW (root_window)->width, FRAME_WIDTH (f)); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5167 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
277 | 5168 } |
5169 } |