Mercurial > emacs
annotate src/xdisp.c @ 24321:0e5b7bb19ddc
(speedbar-item-info-tag-helper): Scan the whole line.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 16 Feb 1999 00:33:44 +0000 |
parents | 6e1f6e29422a |
children | 2612f75bdd2a |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 1998 |
18730
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" |
21514 | 43 #include "region-cache.h" |
44 | |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
45 #ifdef HAVE_X_WINDOWS |
21514 | 46 #include "xterm.h" |
47 #endif | |
277 | 48 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
49 #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
|
50 extern void set_frame_menubar (); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
51 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
|
52 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
53 |
277 | 54 extern int interrupt_input; |
55 extern int command_loop_level; | |
56 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
57 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
58 |
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
|
59 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
|
60 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
61 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
|
62 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
|
63 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
64 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
|
65 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
|
66 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
67 Lisp_Object Qinhibit_point_motion_hooks; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
68 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
69 /* Non-nil means don't actually do any redisplay. */ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
70 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
71 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
72 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
73 /* Nonzero means print newline to stdout before next minibuffer message. */ |
277 | 74 |
75 int noninteractive_need_newline; | |
76 | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
77 /* 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
|
78 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
79 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
80 |
277 | 81 #define min(a, b) ((a) < (b) ? (a) : (b)) |
82 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
11810 | 83 #define minmax(floor, val, ceil) \ |
84 ((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val)) | |
277 | 85 |
86 /* The buffer position of the first character appearing | |
769 | 87 entirely or partially on the current frame line. |
88 Or zero, which disables the optimization for the current frame line. */ | |
277 | 89 static int this_line_bufpos; |
90 | |
91 /* Number of characters past the end of this line, | |
92 including the terminating newline */ | |
93 static int this_line_endpos; | |
94 | |
769 | 95 /* The vertical position of this frame line. */ |
277 | 96 static int this_line_vpos; |
97 | |
769 | 98 /* Hpos value for start of display on this frame line. |
277 | 99 Usually zero, but negative if first character really began |
100 on previous line */ | |
101 static int this_line_start_hpos; | |
102 | |
103 /* Buffer that this_line variables are describing. */ | |
104 static struct buffer *this_line_buffer; | |
105 | |
106 /* Value of echo_area_glyphs when it was last acted on. | |
769 | 107 If this is nonzero, there is a message on the frame |
277 | 108 in the minibuffer and it should be erased as soon |
109 as it is no longer requested to appear. */ | |
110 char *previous_echo_glyphs; | |
111 | |
769 | 112 /* Nonzero means truncate lines in all windows less wide than the frame */ |
277 | 113 int truncate_partial_width_windows; |
114 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
115 /* 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
|
116 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
|
117 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
118 |
277 | 119 Lisp_Object Vglobal_mode_string; |
120 | |
121 /* Marker for where to display an arrow on top of the buffer text. */ | |
122 Lisp_Object Voverlay_arrow_position; | |
123 | |
124 /* String to display for the arrow. */ | |
125 Lisp_Object Voverlay_arrow_string; | |
126 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
127 /* Values of those variables at last redisplay. |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
128 However, if Voverlay_arrow_position is a marker, |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
129 last_arrow_position is its numerical position. */ |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
130 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
131 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
132 /* 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
|
133 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
|
134 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
135 /* 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
|
136 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
|
137 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
138 /* 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
|
139 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
|
140 have changed. */ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
141 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
142 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
143 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
|
144 |
277 | 145 /* Nonzero if overlay arrow has been displayed once in this window. */ |
146 static int overlay_arrow_seen; | |
147 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
148 /* 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
|
149 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
|
150 strings that get displayed there.) */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
151 static int zv_strings_seen; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
152 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
153 /* 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
|
154 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
|
155 |
769 | 156 /* If cursor motion alone moves point off frame, |
277 | 157 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
|
158 static int scroll_step; |
277 | 159 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
160 /* 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
|
161 when appropriate. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
162 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
163 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
164 /* 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
|
165 of the top or bottom of the window. */ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
166 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
167 |
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
168 /* Number of characters of overlap to show, |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
169 when scrolling a one-line window such as a minibuffer. */ |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
170 static int minibuffer_scroll_overlap; |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
171 |
277 | 172 /* Nonzero if try_window_id has made blank lines at window bottom |
173 since the last redisplay that paused */ | |
174 static int blank_end_of_window; | |
175 | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
176 /* 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
|
177 (or another buffer with the same base buffer). |
277 | 178 keyboard.c refers to this. */ |
179 int buffer_shared; | |
180 | |
769 | 181 /* display_text_line sets these to the frame position (origin 0) of point, |
277 | 182 whether the window is selected or not. |
183 Set one to -1 first to determine whether point was found afterwards. */ | |
184 | |
185 static int cursor_vpos; | |
186 static int cursor_hpos; | |
187 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
188 static int debug_end_pos; |
277 | 189 |
190 /* Nonzero means display mode line highlighted */ | |
191 int mode_line_inverse_video; | |
192 | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
193 static void redisplay_internal (); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
194 static int message_log_check_duplicate (); |
277 | 195 static void echo_area_display (); |
196 void mark_window_display_accurate (); | |
197 static void redisplay_windows (); | |
198 static void redisplay_window (); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
199 static void update_menu_bar (); |
277 | 200 static void try_window (); |
201 static int try_window_id (); | |
202 static struct position *display_text_line (); | |
203 static void display_mode_line (); | |
204 static int display_mode_element (); | |
205 static char *decode_mode_spec (); | |
206 static int display_string (); | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
207 static void display_menu_bar (); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
208 static int display_count_lines (); |
277 | 209 |
210 /* 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
|
211 Lisp_Object minibuf_prompt; |
277 | 212 |
213 /* Width in columns of current minibuffer prompt. */ | |
214 int minibuf_prompt_width; | |
215 | |
216 /* Message to display instead of minibuffer contents | |
217 This is what the functions error and message make, | |
218 and command echoing uses it as well. | |
219 It overrides the minibuf_prompt as well as the buffer. */ | |
220 char *echo_area_glyphs; | |
221 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
222 /* 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
|
223 int echo_area_glyphs_length; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
224 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
225 /* 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
|
226 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
|
227 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
|
228 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
|
229 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
230 /* 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
|
231 message was specified. */ |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
232 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
233 |
277 | 234 /* true iff we should redraw the mode lines on the next redisplay */ |
235 int update_mode_lines; | |
236 | |
237 /* Smallest number of characters before the gap | |
238 at any time since last redisplay that finished. | |
239 Valid for current buffer when try_window_id can be called. */ | |
240 int beg_unchanged; | |
241 | |
242 /* Smallest number of characters after the gap | |
243 at any time since last redisplay that finished. | |
244 Valid for current buffer when try_window_id can be called. */ | |
245 int end_unchanged; | |
246 | |
247 /* 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
|
248 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
|
249 matches OVERLAY_MODIFF, that means beg_unchanged and end_unchanged |
277 | 250 contain no useful information */ |
251 int unchanged_modified; | |
252 | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
253 /* 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
|
254 int overlay_unchanged_modified; |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
255 |
277 | 256 /* Nonzero if window sizes or contents have changed |
257 since last redisplay that finished */ | |
258 int windows_or_buffers_changed; | |
259 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
260 /* 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
|
261 and it displayed a line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
262 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
263 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
264 /* 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
|
265 static int line_number_display_limit; |
10393 | 266 |
267 /* Number of lines to keep in the message log buffer. | |
268 t means infinite. nil means don't log at all. */ | |
269 Lisp_Object Vmessage_log_max; | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
270 |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
271 #define COERCE_MARKER(X) \ |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
272 (MARKERP ((X)) ? Fmarker_position (X) : (X)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
273 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
274 static int pos_tab_offset P_ ((struct window *, int, int)); |
277 | 275 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
276 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
277 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
278 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
279 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
280 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
281 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
282 message_dolog ("", 0, 1, 0); |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
283 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
284 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
285 |
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
286 /* 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
|
287 This function calls low-level routines in order to bypass text property |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
288 hooks, etc. which might not be safe to run. |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
289 MULTIBYTE, if nonzero, means interpret the contents of M as multibyte. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
290 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
291 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
292 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
293 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
294 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
295 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
296 if (!NILP (Vmessage_log_max)) |
10393 | 297 { |
298 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
299 Lisp_Object oldpoint, oldbegv, oldzv; |
13733
e51b69e60614
(message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents:
13655
diff
changeset
|
300 int old_windows_or_buffers_changed = windows_or_buffers_changed; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
301 int point_at_end = 0; |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
302 int zv_at_end = 0; |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
303 Lisp_Object old_deactivate_mark, tem; |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
304 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
305 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
306 old_deactivate_mark = Vdeactivate_mark; |
10393 | 307 oldbuf = current_buffer; |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
308 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
|
309 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
310 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
311 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
312 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
313 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
314 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
315 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
316 if (PT == Z) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
317 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
318 if (ZV == Z) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
319 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
320 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
321 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
322 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
323 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
324 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
325 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
326 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
327 /* Insert the string--maybe converting multibyte to single byte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
328 or vice versa, so that all the text fits the buffer. */ |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
329 if (multibyte |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
330 && NILP (current_buffer->enable_multibyte_characters)) |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
331 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
332 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
333 unsigned char work[1]; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
334 /* Convert a multibyte string to single-byte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
335 for the *Message* buffer. */ |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
336 for (i = 0; i < len; i += nbytes) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
337 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
338 c = STRING_CHAR_AND_LENGTH (m + i, len - i, nbytes); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
339 work[0] = (SINGLE_BYTE_CHAR_P (c) |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
340 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
341 : multibyte_char_to_unibyte (c, Qnil)); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
342 insert_1_both (work, 1, 1, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
343 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
344 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
345 else if (! multibyte |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
346 && ! NILP (current_buffer->enable_multibyte_characters)) |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
347 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
348 int i, c, nbytes; |
20786
49d68bf8f34b
(message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents:
20703
diff
changeset
|
349 unsigned char *msg = (unsigned char *) m; |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
350 unsigned char *str, work[4]; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
351 /* Convert a single-byte string to multibyte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
352 for the *Message* buffer. */ |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
353 for (i = 0; i < len; i++) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
354 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
355 c = unibyte_char_to_multibyte (msg[i]); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
356 nbytes = CHAR_STRING (c, work, str); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
357 insert_1_both (work, 1, nbytes, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
358 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
359 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
360 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
361 insert_1 (m, len, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
362 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
363 if (nlflag) |
10393 | 364 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
365 int this_bol, this_bol_byte, prev_bol, prev_bol_byte, dup; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
366 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
367 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
368 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
369 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
370 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
371 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
372 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
373 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
374 scan_newline (PT, PT_BYTE, BEG, BEG_BYTE, -2, 0); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
375 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
376 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
377 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
378 dup = message_log_check_duplicate (prev_bol, prev_bol_byte, |
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
379 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
380 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
381 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
382 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
383 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
384 if (dup > 1) |
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 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
387 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
388 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
389 /* 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
|
390 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
391 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
392 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
393 TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
394 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
395 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
396 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
397 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
398 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
399 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
400 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
401 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
402 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
403 del_range_both (BEG, BEG_BYTE, PT, PT_BYTE, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
404 } |
10393 | 405 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
406 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
407 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
408 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
409 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
410 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
411 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
412 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
413 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
414 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
415 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
416 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
417 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
418 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
419 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
420 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
421 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
422 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
423 /* We can't do Fgoto_char (oldpoint) because it will run some |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
424 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
425 TEMP_SET_PT_BOTH (XMARKER (oldpoint)->charpos, |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
426 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
427 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
428 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
429 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
430 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
431 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
432 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
433 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 434 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
435 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
436 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
|
437 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
438 Vdeactivate_mark = old_deactivate_mark; |
10393 | 439 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
440 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
441 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
442 /* 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
|
443 (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
|
444 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
|
445 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
|
446 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
|
447 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
448 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
449 message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte) |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
450 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
451 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
452 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
453 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
454 int len = Z_BYTE - 1 - this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
455 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
456 unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
457 unsigned char *p2 = BUF_BYTE_ADDRESS (current_buffer, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
458 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
459 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
460 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
461 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
|
462 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
463 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
464 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
465 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
466 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
467 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
468 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
469 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
470 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
471 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
472 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
473 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
474 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
475 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
476 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
477 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
478 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
479 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
480 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
481 /* 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
|
482 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
|
483 existing message, and let the minibuffer text show through. |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
484 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
485 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
|
486 gets cleared or some other message gets displayed there. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
487 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
488 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
|
489 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
|
490 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
491 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
492 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
493 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
494 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
495 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
496 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
497 /* 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
|
498 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
499 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
500 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
501 message2_nolog (m, len, multibyte); |
10393 | 502 } |
503 | |
504 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
505 /* The non-logging counterpart of message2. */ |
10393 | 506 |
507 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
508 message2_nolog (m, len, multibyte) |
10393 | 509 char *m; |
510 int len; | |
511 { | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
512 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
513 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
514 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
515 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
516 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
517 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
518 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
|
519 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
520 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
521 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
522 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
523 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
524 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
525 /* 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
|
526 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
527 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
|
528 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
529 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
530 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
531 FRAME_PTR f; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
532 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
533 /* 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
|
534 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
|
535 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
|
536 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
|
537 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
538 FRAME_SAMPLE_VISIBILITY (f); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
539 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
|
540 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
541 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
|
542 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
543 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
544 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
545 echo_area_glyphs = m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
546 echo_area_glyphs_length = len; |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
547 |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
548 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
549 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
550 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
551 else |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
552 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
|
553 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
554 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
|
555 echo_area_display (); |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
556 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
|
557 do_pending_window_change (); |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
558 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
|
559 (*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
|
560 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
561 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
562 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
563 /* Display in echo area the null-terminated ASCII-only string M. |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
564 If M is 0, clear out any existing message, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
565 and let the minibuffer text show through. |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
566 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
567 The string M must continue to exist until after the echo area |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
568 gets cleared or some other message gets displayed there. |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
569 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
570 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
|
571 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
|
572 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
573 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
574 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
575 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
576 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
577 message2 (m, (m ? strlen (m) : 0), 0); |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
578 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
579 |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
580 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
581 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
582 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
583 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
584 message2_nolog (m, (m ? strlen (m) : 0), 0); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
585 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
586 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
587 /* Display a message M which contains a single %s |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
588 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
589 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
590 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
591 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
592 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
593 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
594 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
595 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
596 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
597 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
598 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
599 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
600 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
601 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
602 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
603 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
604 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
605 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
606 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
607 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
608 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
609 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
610 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
611 /* The frame whose minibuffer we're going to display the message on. |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
612 It may be larger than the selected frame, so we need |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
613 to use its buffer, not the selected frame's buffer. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
614 Lisp_Object mini_window; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
615 FRAME_PTR f; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
616 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
617 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
618 that the selected frame is using. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
619 mini_window = FRAME_MINIBUF_WINDOW (selected_frame); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
620 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
621 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
622 /* A null message buffer means that the frame hasn't really been |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
623 initialized yet. Error messages get reported properly by |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
624 cmd_error, so this must be just an informative message; toss it. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
625 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
626 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
627 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
628 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
629 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
630 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
631 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
632 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
633 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
634 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
635 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
636 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
637 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
638 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
639 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
640 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
641 /* Print should start at the beginning of the message |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
642 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
643 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
644 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
645 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
646 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
647 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
648 /* 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
|
649 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
|
650 |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
651 void |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
652 truncate_echo_area (len) |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
653 int len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
654 { |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
655 /* 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
|
656 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
|
657 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
|
658 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
|
659 echo_area_glyphs_length = len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
660 } |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
661 |
769 | 662 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print; |
331 | 663 zero if being used by message. */ |
664 int message_buf_print; | |
665 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
666 /* 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
|
667 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
|
668 |
277 | 669 /* VARARGS 1 */ |
670 void | |
671 message (m, a1, a2, a3) | |
672 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
673 EMACS_INT a1, a2, a3; |
277 | 674 { |
675 if (noninteractive) | |
676 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
677 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
678 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
679 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
|
680 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
|
681 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
|
682 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
683 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
684 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
|
685 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
686 } |
277 | 687 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
688 else if (INTERACTIVE) |
277 | 689 { |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
690 /* 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
|
691 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
|
692 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
|
693 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
694 FRAME_PTR f; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
695 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
696 /* 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
|
697 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
|
698 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
|
699 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 700 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
701 /* 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
|
702 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
|
703 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
|
704 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
|
705 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
706 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
707 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
708 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
|
709 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
710 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
711 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
712 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
713 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
714 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
715 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
716 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
|
717 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
718 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
719 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
720 (char **) &a1); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
721 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
722 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
723 message2 (FRAME_MESSAGE_BUF (f), len, 0); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
724 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
725 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
726 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
727 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
728 /* 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
|
729 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
|
730 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
|
731 } |
277 | 732 } |
733 } | |
734 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
735 /* The non-logging version of message. */ |
11193 | 736 void |
737 message_nolog (m, a1, a2, a3) | |
738 char *m; | |
739 EMACS_INT a1, a2, a3; | |
740 { | |
741 Lisp_Object old_log_max; | |
742 old_log_max = Vmessage_log_max; | |
743 Vmessage_log_max = Qnil; | |
744 message (m, a1, a2, a3); | |
745 Vmessage_log_max = old_log_max; | |
746 } | |
747 | |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
748 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
749 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
750 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
751 message2 (echo_area_glyphs, echo_area_glyphs_length, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
752 ! NILP (current_buffer->enable_multibyte_characters)); |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
753 } |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
754 |
277 | 755 static void |
756 echo_area_display () | |
757 { | |
758 register int vpos; | |
769 | 759 FRAME_PTR f; |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
760 Lisp_Object mini_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
761 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
762 /* 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
|
763 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
|
764 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
|
765 /* 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
|
766 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 767 |
769 | 768 if (! FRAME_VISIBLE_P (f)) |
277 | 769 return; |
770 | |
769 | 771 if (frame_garbaged) |
277 | 772 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
773 redraw_garbaged_frames (); |
769 | 774 frame_garbaged = 0; |
277 | 775 } |
776 | |
777 if (echo_area_glyphs || minibuf_level == 0) | |
778 { | |
16266
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
779 int i; |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
780 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
781 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
|
782 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
783 vpos = XFASTINT (XWINDOW (mini_window)->top); |
769 | 784 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
|
785 |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
786 /* 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
|
787 are always clear. */ |
67f0dc60a944
(echo_area_display): Clear the left-side scroll bar columns.
Richard M. Stallman <rms@gnu.org>
parents:
16255
diff
changeset
|
788 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
|
789 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
|
790 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
791 display_string (XWINDOW (mini_window), vpos, |
277 | 792 echo_area_glyphs ? echo_area_glyphs : "", |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
793 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
|
794 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
|
795 0, 0, 0, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
796 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
|
797 message_enable_multibyte); |
277 | 798 |
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
799 #if 0 /* This just gets in the way. update_frame does the job. */ |
277 | 800 /* 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
|
801 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
|
802 FRAME_CURSOR_Y (f) = vpos; |
769 | 803 if (FRAME_CURSOR_Y (f) == vpos) |
804 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
|
805 #endif |
727 | 806 |
807 /* Fill the rest of the minibuffer window with blank lines. */ | |
808 { | |
809 int i; | |
810 | |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
811 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
|
812 i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++) |
727 | 813 { |
769 | 814 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
|
815 /* 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
|
816 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
|
817 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
|
818 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
|
819 "", 0, |
18718
1fb4c75d4f1f
(echo_area_display): Don't offset using left-side
Richard M. Stallman <rms@gnu.org>
parents:
18703
diff
changeset
|
820 0, 0, 0, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
821 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
|
822 0); |
727 | 823 } |
824 } | |
277 | 825 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
826 else if (!EQ (mini_window, selected_window)) |
277 | 827 windows_or_buffers_changed++; |
828 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
829 if (EQ (mini_window, selected_window)) |
277 | 830 this_line_bufpos = 0; |
831 | |
832 previous_echo_glyphs = echo_area_glyphs; | |
833 } | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
834 |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
835 /* 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
|
836 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
837 #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
|
838 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
|
839 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
|
840 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
841 static int |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
842 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
|
843 char *str; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
844 int mincol, maxcol; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
845 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
846 char *limit; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
847 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
|
848 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
|
849 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
|
850 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
|
851 *frame_title_ptr++ = *str++; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
852 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
|
853 *frame_title_ptr++ = ' '; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
854 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
|
855 } |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
856 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
857 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
858 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
|
859 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
860 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
861 Lisp_Object fmt; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
862 struct buffer *obuf; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
863 int len; |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
864 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
|
865 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
866 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
|
867 return; |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
868 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
869 /* 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
|
870 { |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
871 Lisp_Object tail; |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
872 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
873 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
|
874 { |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
875 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
|
876 |
11948
19ebc17d1288
(x_consider_frame_title): Use FRAME_KBOARD.
Karl Heuer <kwzh@gnu.org>
parents:
11920
diff
changeset
|
877 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
|
878 && !FRAME_MINIBUF_ONLY_P (tf) |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
879 && (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
|
880 break; |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
881 } |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
882 |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
883 multiple_frames = CONSP (tail); |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
884 } |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
885 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
886 obuf = current_buffer; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
887 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
|
888 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
|
889 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
|
890 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
|
891 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
|
892 frame_title_ptr = 0; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
893 set_buffer_internal (obuf); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
894 /* 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
|
895 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
|
896 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
|
897 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
|
898 level than this.) */ |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
899 if (! STRINGP (f->name) || STRING_BYTES (XSTRING (f->name)) != len |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
900 || 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
|
901 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
|
902 } |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
903 #else |
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
904 #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
|
905 #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
|
906 #endif |
277 | 907 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
908 /* Prepare for redisplay by updating menu-bar item lists when appropriate. |
11499 | 909 This can call eval. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
910 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
911 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
912 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
913 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
914 register struct window *w = XWINDOW (selected_window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
915 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
916 struct gcpro gcpro1, gcpro2; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
917 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
918 all_windows = (update_mode_lines || buffer_shared > 1 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
919 || windows_or_buffers_changed); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
920 |
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
921 /* 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
|
922 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
|
923 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
|
924 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
925 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
|
926 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
|
927 "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
|
928 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
|
929 has yet been specified." |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
930 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
|
931 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
932 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
|
933 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
934 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
935 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
936 FOR_EACH_FRAME (tail, frame) |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
937 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
|
938 || FRAME_ICONIFIED_P (XFRAME (frame))) |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
939 x_consider_frame_title (frame); |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
940 } |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
941 #endif |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
942 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
943 /* Update the menu bar item lists, if appropriate. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
944 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
|
945 or generation of display lines. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
946 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
947 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
948 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
|
949 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
|
950 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
951 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
952 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
953 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
954 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
955 /* 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
|
956 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
|
957 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame))) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
958 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
959 Lisp_Object functions; |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
960 /* 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
|
961 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
|
962 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
963 GCPRO2 (tail, functions); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
964 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
965 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
966 call1 (XCONS (functions)->car, frame); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
967 functions = XCONS (functions)->cdr; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
968 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
969 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
970 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
971 GCPRO1 (tail); |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
972 update_menu_bar (XFRAME (frame), 0); |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
973 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
974 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
975 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
976 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
977 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
978 else |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
979 update_menu_bar (selected_frame, 1); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
980 |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
981 /* 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
|
982 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
|
983 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
984 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
985 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
986 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
987 |
769 | 988 /* Do a frame update, taking possible shortcuts into account. |
277 | 989 This is the main external entry point for redisplay. |
990 | |
991 If the last redisplay displayed an echo area message and that | |
992 message is no longer requested, we clear the echo area | |
993 or bring back the minibuffer if that is in use. | |
994 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
995 Do not call eval from within this function. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
996 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
|
997 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
|
998 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
|
999 but can still lose, because this function |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1000 can be called from signal handlers; with alarms set up; |
277 | 1001 or with synchronous processes running. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1002 |
277 | 1003 See Fcall_process; if you called it from here, it could be |
1004 entered recursively. */ | |
1005 | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1006 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
|
1007 |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1008 /* 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
|
1009 no more than once ever 1000 redisplays. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1010 static int clear_face_cache_count; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1011 |
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1012 /* Record the previous terminal frame we displayed. */ |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1013 static FRAME_PTR previous_terminal_frame; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1014 |
277 | 1015 void |
1016 redisplay () | |
1017 { | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1018 redisplay_internal (0); |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1019 } |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1020 |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1021 /* 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
|
1022 is not in response to any user action; therefore, we should |
14683 | 1023 preserve the echo area. (Actually, our caller does that job.) |
1024 Perhaps in the future avoid recentering windows | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1025 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
|
1026 |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1027 static void |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1028 redisplay_internal (preserve_echo_area) |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1029 int preserve_echo_area; |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1030 { |
277 | 1031 register struct window *w = XWINDOW (selected_window); |
1032 register int pause; | |
1033 int must_finish = 0; | |
1034 int all_windows; | |
1035 register int tlbufpos, tlendpos; | |
1036 struct position pos; | |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1037 int number_of_visible_frames; |
277 | 1038 |
1039 if (noninteractive) | |
1040 return; | |
1041 | |
14559
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1042 #ifdef USE_X_TOOLKIT |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1043 if (popup_activated ()) |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1044 return; |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1045 #endif |
de955910bcef
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Richard M. Stallman <rms@gnu.org>
parents:
14465
diff
changeset
|
1046 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1047 if (! NILP (Vinhibit_redisplay)) |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1048 return; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
1049 |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1050 retry: |
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1051 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1052 if (! FRAME_WINDOW_P (selected_frame) |
12765
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1053 && previous_terminal_frame != selected_frame) |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1054 { |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1055 /* 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
|
1056 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
|
1057 windows_or_buffers_changed++; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1058 SET_FRAME_GARBAGED (selected_frame); |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1059 XSETFRAME (Vterminal_frame, selected_frame); |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1060 } |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1061 previous_terminal_frame = selected_frame; |
27b568b455b1
(redisplay): When displaying a terminal frame,
Richard M. Stallman <rms@gnu.org>
parents:
12684
diff
changeset
|
1062 |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1063 /* 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
|
1064 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
|
1065 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
|
1066 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
|
1067 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1068 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
|
1069 |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1070 number_of_visible_frames = 0; |
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1071 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1072 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
|
1073 { |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1074 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1075 |
19197
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1076 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
|
1077 number_of_visible_frames++; |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1078 |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1079 /* 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
|
1080 glyphs to display. */ |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1081 init_desired_glyphs (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1082 } |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1083 } |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1084 |
769 | 1085 /* Notice any pending interrupt request to change frame size. */ |
277 | 1086 do_pending_window_change (); |
1087 | |
769 | 1088 if (frame_garbaged) |
277 | 1089 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
1090 redraw_garbaged_frames (); |
769 | 1091 frame_garbaged = 0; |
277 | 1092 } |
1093 | |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1094 prepare_menu_bars (); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
1095 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1096 if (windows_or_buffers_changed) |
277 | 1097 update_mode_lines++; |
1098 | |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1099 /* 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
|
1100 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) |
277 | 1101 { |
1102 w->update_mode_line = Qt; | |
1103 if (buffer_shared > 1) | |
1104 update_mode_lines++; | |
1105 } | |
1106 | |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1107 /* If %c is in use, update it if needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1108 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1109 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1110 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1111 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1112 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1113 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1114 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1115 w->update_mode_line = Qt; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1116 |
769 | 1117 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; |
277 | 1118 |
1119 all_windows = update_mode_lines || buffer_shared > 1; | |
1120 | |
1121 /* If specs for an arrow have changed, do thorough redisplay | |
1122 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
|
1123 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
|
1124 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1125 all_windows = 1; |
277 | 1126 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1127 /* 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
|
1128 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
|
1129 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
|
1130 again here. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1131 if (echo_area_glyphs || previous_echo_glyphs) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1132 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1133 echo_area_display (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1134 must_finish = 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1135 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1136 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1137 /* 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
|
1138 if (((!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1139 && !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
|
1140 != !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
|
1141 || (!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
|
1142 && !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
|
1143 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
|
1144 this_line_bufpos = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1145 |
277 | 1146 tlbufpos = this_line_bufpos; |
1147 tlendpos = this_line_endpos; | |
485 | 1148 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
|
1149 && !current_buffer->clip_changed |
769 | 1150 && 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
|
1151 && !FRAME_OBSCURED_P (XFRAME (w->frame)) |
277 | 1152 /* Make sure recorded data applies to current buffer, etc */ |
1153 && this_line_buffer == current_buffer | |
1154 && current_buffer == XBUFFER (w->buffer) | |
485 | 1155 && NILP (w->force_start) |
277 | 1156 /* Point must be on the line that we have info recorded about */ |
6705 | 1157 && PT >= tlbufpos |
1158 && PT <= Z - tlendpos | |
277 | 1159 /* All text outside that line, including its final newline, |
1160 must be unchanged */ | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1161 && ((XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1162 && (XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)) |
277 | 1163 || (beg_unchanged >= tlbufpos - 1 |
1164 && GPT >= tlbufpos | |
528 | 1165 /* If selective display, can't optimize |
1166 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
|
1167 && ((INTEGERP (current_buffer->selective_display) |
528 | 1168 && XINT (current_buffer->selective_display) > 0 |
1169 ? (beg_unchanged >= tlbufpos | |
1170 && GPT > tlbufpos) | |
1171 : 1)) | |
277 | 1172 && end_unchanged >= tlendpos |
1173 && Z - GPT >= tlendpos))) | |
1174 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1175 int tlbufpos_byte = CHAR_TO_BYTE (tlbufpos); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1176 if (tlbufpos > BEGV && FETCH_BYTE (tlbufpos_byte - 1) != '\n' |
277 | 1177 && (tlbufpos == ZV |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1178 || FETCH_BYTE (tlbufpos_byte) == '\n')) |
277 | 1179 /* Former continuation line has disappeared by becoming empty */ |
1180 goto cancel; | |
1181 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
|
1182 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF |
277 | 1183 || MINI_WINDOW_P (w)) |
1184 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1185 /* 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
|
1186 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
|
1187 line 885). |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1188 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1189 For instance, in the following case: |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1190 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1191 -------- Insert -------- |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1192 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
|
1193 J_I_ ==> J_I_ `^^' are cursors. |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1194 ^^ ^^ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1195 -------- -------- |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1196 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1197 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
|
1198 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1199 struct position val; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1200 int prevline; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1201 int opoint = PT, opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1202 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1203 scan_newline (tlbufpos, tlbufpos_byte, BEGV, BEGV_BYTE, -1, 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1204 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1205 val = *compute_motion (PT, 0, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1206 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
|
1207 0, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1208 tlbufpos, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1209 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1210 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1211 window_internal_width (w) - 1, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1212 XINT (w->hscroll), 0, w); |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
1213 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1214 if (val.hpos != this_line_start_hpos) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1215 goto cancel; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1216 |
277 | 1217 cursor_vpos = -1; |
1218 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1219 zv_strings_seen = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1220 display_text_line (w, tlbufpos, tlbufpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1221 this_line_vpos, this_line_start_hpos, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1222 pos_tab_offset (w, tlbufpos, tlbufpos_byte), 0); |
277 | 1223 /* If line contains point, is not continued, |
1224 and ends at same distance from eob as before, we win */ | |
1225 if (cursor_vpos >= 0 && this_line_bufpos | |
1226 && this_line_endpos == tlendpos) | |
1227 { | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1228 /* 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
|
1229 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
|
1230 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
|
1231 < 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
|
1232 { |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1233 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
|
1234 int *charstart_next_line |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1235 = 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
|
1236 int adjust; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1237 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1238 if (Z - tlendpos == ZV) |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1239 /* 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
|
1240 There is no newline to count. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1241 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
|
1242 else |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1243 /* This line ends in a newline. |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1244 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
|
1245 text that follows. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1246 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
|
1247 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
1248 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
|
1249 } |
6619
b3631c88ec7e
(redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents:
6612
diff
changeset
|
1250 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
1251 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1252 preserve_other_columns (w); |
1253 goto update; | |
1254 } | |
1255 else | |
1256 goto cancel; | |
1257 } | |
12410
1c02a5b45ae7
(echo_area_display): Don't set FRAME_CURSOR_... here.
Richard M. Stallman <rms@gnu.org>
parents:
12348
diff
changeset
|
1258 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
|
1259 /* 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
|
1260 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
|
1261 && 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
|
1262 && (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
|
1263 > FRAME_CURSOR_Y (selected_frame))) |
277 | 1264 { |
1265 if (!must_finish) | |
1266 { | |
1267 do_pending_window_change (); | |
1268 return; | |
1269 } | |
1270 goto update; | |
1271 } | |
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
1272 /* 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
|
1273 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
|
1274 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
|
1275 && !NILP (current_buffer->mark_active)) |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1276 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1277 || 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
|
1278 && 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
|
1279 && !cursor_in_echo_area) |
277 | 1280 { |
1281 pos = *compute_motion (tlbufpos, 0, | |
1282 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1283 0, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
1284 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
|
1285 window_internal_width (w) - 1, |
574 | 1286 XINT (w->hscroll), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1287 pos_tab_offset (w, tlbufpos, tlbufpos_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1288 w); |
277 | 1289 if (pos.vpos < 1) |
1290 { | |
11810 | 1291 int width = window_internal_width (w) - 1; |
769 | 1292 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
|
1293 = WINDOW_LEFT_MARGIN (w) + minmax (0, pos.hpos, width); |
769 | 1294 FRAME_CURSOR_Y (selected_frame) = this_line_vpos; |
277 | 1295 goto update; |
1296 } | |
1297 else | |
1298 goto cancel; | |
1299 } | |
1300 cancel: | |
1301 /* Text changed drastically or point moved off of line */ | |
769 | 1302 cancel_line (this_line_vpos, selected_frame); |
277 | 1303 } |
1304 | |
1305 this_line_bufpos = 0; | |
1306 all_windows |= buffer_shared > 1; | |
1307 | |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1308 clear_face_cache_count++; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1309 |
277 | 1310 if (all_windows) |
1311 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1312 Lisp_Object tail, frame; |
277 | 1313 |
9572 | 1314 #ifdef HAVE_FACES |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1315 /* 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
|
1316 and not too often either. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1317 if (clear_face_cache_count > 1000) |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1318 { |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1319 clear_face_cache (); |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1320 clear_face_cache_count = 0; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
1321 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1322 #endif |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1323 |
277 | 1324 /* Recompute # windows showing selected buffer. |
433 | 1325 This will be incremented each time such a window is displayed. */ |
277 | 1326 buffer_shared = 0; |
1327 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1328 FOR_EACH_FRAME (tail, frame) |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1329 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
1330 FRAME_PTR f = XFRAME (frame); |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1331 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
|
1332 { |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1333 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1334 /* 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
|
1335 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
|
1336 if (condemn_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1337 (*condemn_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1338 |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1339 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
|
1340 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
|
1341 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1342 /* 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
|
1343 should now go away. */ |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1344 if (judge_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1345 (*judge_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
1346 } |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1347 } |
277 | 1348 } |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1349 else if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
277 | 1350 { |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1351 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
|
1352 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1353 preserve_other_columns (w); |
1354 } | |
1355 | |
1356 update: | |
1357 /* Prevent various kinds of signals during display update. | |
1358 stdio is not robust about handling signals, | |
1359 which can cause an apparent I/O error. */ | |
1360 if (interrupt_input) | |
1361 unrequest_sigio (); | |
1362 stop_polling (); | |
1363 | |
1364 if (all_windows) | |
1365 { | |
1366 Lisp_Object tail; | |
1367 | |
1368 pause = 0; | |
1369 | |
769 | 1370 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
277 | 1371 { |
769 | 1372 FRAME_PTR f; |
277 | 1373 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1374 if (!FRAMEP (XCONS (tail)->car)) |
277 | 1375 continue; |
1376 | |
769 | 1377 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
|
1378 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1379 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
|
1380 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
277 | 1381 { |
769 | 1382 pause |= update_frame (f, 0, 0); |
277 | 1383 if (!pause) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1384 { |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1385 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
|
1386 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
|
1387 (*frame_up_to_date_hook) (f); |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1388 } |
277 | 1389 } |
1390 } | |
1391 } | |
1392 else | |
368 | 1393 { |
19701
18d979b08faf
(redisplay_internal): Check to see if frame is not obscured
Geoff Voelker <voelker@cs.washington.edu>
parents:
19571
diff
changeset
|
1394 if (FRAME_VISIBLE_P (selected_frame) && !FRAME_OBSCURED_P (selected_frame)) |
769 | 1395 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
|
1396 else |
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1397 pause = 0; |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1398 |
433 | 1399 /* We may have called echo_area_display at the top of this |
769 | 1400 function. If the echo area is on another frame, that may |
1401 have put text on a frame other than the selected one, so the | |
1402 above call to update_frame would not have caught it. Catch | |
433 | 1403 it here. */ |
1404 { | |
12792
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1405 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
|
1406 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
|
1407 |
937154a9dfbe
(redisplay): Compute mini_frame the same way echo_area_display does.
Richard M. Stallman <rms@gnu.org>
parents:
12765
diff
changeset
|
1408 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
|
1409 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
433 | 1410 |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
1411 if (mini_frame != selected_frame && FRAME_WINDOW_P (mini_frame)) |
769 | 1412 pause |= update_frame (mini_frame, 0, 0); |
433 | 1413 } |
368 | 1414 } |
277 | 1415 |
769 | 1416 /* If frame does not match, prevent doing single-line-update next time. |
277 | 1417 Also, don't forget to check every line to update the arrow. */ |
1418 if (pause) | |
1419 { | |
1420 this_line_bufpos = 0; | |
485 | 1421 if (!NILP (last_arrow_position)) |
277 | 1422 { |
1423 last_arrow_position = Qt; | |
1424 last_arrow_string = Qt; | |
1425 } | |
769 | 1426 /* If we pause after scrolling, some lines in current_frame |
277 | 1427 may be null, so preserve_other_columns won't be able to |
1428 preserve all the vertical-bar separators. So, avoid using it | |
1429 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
|
1430 if (!WINDOW_FULL_WIDTH_P (w)) |
277 | 1431 update_mode_lines = 1; |
1432 } | |
1433 | |
769 | 1434 /* Now text on frame agrees with windows, so |
277 | 1435 put info into the windows for partial redisplay to follow */ |
1436 | |
1437 if (!pause) | |
1438 { | |
1439 register struct buffer *b = XBUFFER (w->buffer); | |
1440 | |
1441 blank_end_of_window = 0; | |
1442 unchanged_modified = BUF_MODIFF (b); | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1443 overlay_unchanged_modified = BUF_OVERLAY_MODIFF (b); |
277 | 1444 beg_unchanged = BUF_GPT (b) - BUF_BEG (b); |
1445 end_unchanged = BUF_Z (b) - BUF_GPT (b); | |
1446 | |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1447 /* Record the last place cursor was displayed in this window. |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1448 But not if cursor is in the echo area, because in that case |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1449 FRAME_CURSOR_X and FRAME_CURSOR_Y are in the echo area. */ |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1450 if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (selected_frame) |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1451 && EQ (FRAME_MINIBUF_WINDOW (selected_frame), minibuf_window))) |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1452 { |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1453 XSETFASTINT (w->last_point, BUF_PT (b)); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1454 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (selected_frame)); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1455 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame)); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1456 } |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1457 else |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1458 /* Make last_point invalid, since we don't really know |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1459 where the cursor would be if it were not in the echo area. */ |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
1460 XSETINT (w->last_point, -1); |
277 | 1461 |
1462 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
|
1463 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); |
277 | 1464 else |
1465 { | |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1466 b->clip_changed = 0; |
277 | 1467 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
|
1468 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
|
1469 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
|
1470 w->last_had_star |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1471 = (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
|
1472 ? Qt : Qnil); |
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1473 |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1474 /* 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
|
1475 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
|
1476 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
|
1477 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1478 || 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
|
1479 && !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
|
1480 ? 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
|
1481 : Qnil); |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
1482 |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1483 w->window_end_valid = w->buffer; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1484 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
277 | 1485 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
|
1486 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
|
1487 verify_charstarts (w); |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1488 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
|
1489 (*frame_up_to_date_hook) (selected_frame); |
277 | 1490 } |
1491 update_mode_lines = 0; | |
1492 windows_or_buffers_changed = 0; | |
1493 } | |
1494 | |
1495 /* Start SIGIO interrupts coming again. | |
1496 Having them off during the code above | |
1497 makes it less likely one will discard output, | |
1498 but not impossible, since there might be stuff | |
1499 in the system buffer here. | |
1500 But it is much hairier to try to do anything about that. */ | |
1501 | |
1502 if (interrupt_input) | |
1503 request_sigio (); | |
1504 start_polling (); | |
1505 | |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1506 /* 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
|
1507 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
|
1508 if (!pause) |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1509 { |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1510 Lisp_Object tail, frame; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1511 int new_count = 0; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1512 |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1513 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
|
1514 { |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1515 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
|
1516 |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1517 if (XFRAME (frame)->visible) |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1518 this_is_visible = 1; |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1519 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1520 if (XFRAME (frame)->visible) |
bca1fd2554e0
(redisplay_internal): Count only visible frames at first.
Richard M. Stallman <rms@gnu.org>
parents:
19120
diff
changeset
|
1521 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
|
1522 |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1523 if (this_is_visible) |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1524 new_count++; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1525 } |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1526 |
19120
1ba82399f2b1
(redisplay_internal): Count number of visible frames
Richard M. Stallman <rms@gnu.org>
parents:
19061
diff
changeset
|
1527 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
|
1528 windows_or_buffers_changed++; |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1529 } |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
1530 |
769 | 1531 /* Change frame size now if a change is pending. */ |
277 | 1532 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
|
1533 |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1534 /* 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
|
1535 visible frames, redisplay again. */ |
7757
8d27747de7ca
(redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents:
7752
diff
changeset
|
1536 if (windows_or_buffers_changed && !pause) |
18703
2e597c7309b3
(redisplay_internal): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18684
diff
changeset
|
1537 goto retry; |
277 | 1538 } |
1539 | |
1540 /* Redisplay, but leave alone any recent echo area message | |
1541 unless another message has been requested in its place. | |
1542 | |
1543 This is useful in situations where you need to redisplay but no | |
1544 user action has occurred, making it inappropriate for the message | |
1545 area to be cleared. See tracking_off and | |
1546 wait_reading_process_input for examples of these situations. */ | |
1547 | |
20363
f3c322901601
(redisplay_preserve_echo_area): Declare it as void.
Kenichi Handa <handa@m17n.org>
parents:
20259
diff
changeset
|
1548 void |
277 | 1549 redisplay_preserve_echo_area () |
1550 { | |
1551 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0) | |
1552 { | |
1553 echo_area_glyphs = previous_echo_glyphs; | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1554 redisplay_internal (1); |
277 | 1555 echo_area_glyphs = 0; |
1556 } | |
1557 else | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1558 redisplay_internal (1); |
277 | 1559 } |
1560 | |
1561 void | |
1562 mark_window_display_accurate (window, flag) | |
1563 Lisp_Object window; | |
1564 int flag; | |
1565 { | |
1566 register struct window *w; | |
1567 | |
485 | 1568 for (;!NILP (window); window = w->next) |
277 | 1569 { |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1570 if (!WINDOWP (window)) abort (); |
277 | 1571 w = XWINDOW (window); |
1572 | |
485 | 1573 if (!NILP (w->buffer)) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1574 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1575 XSETFASTINT (w->last_modified, |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1576 !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
|
1577 XSETFASTINT (w->last_overlay_modified, |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1578 !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
|
1579 w->last_had_star |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1580 = (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
|
1581 ? Qt : Qnil); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1582 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1583 /* 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
|
1584 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
|
1585 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
|
1586 && (w == XWINDOW (current_buffer->last_selected_window) |
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
1587 || highlight_nonselected_windows) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1588 && !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
|
1589 ? 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
|
1590 : Qnil); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1591 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1592 |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1593 w->window_end_valid = w->buffer; |
277 | 1594 w->update_mode_line = Qnil; |
14263
082e86e9bca3
(mark_window_display_accurate): buffer->clip_changed was
Karl Heuer <kwzh@gnu.org>
parents:
14206
diff
changeset
|
1595 if (!NILP (w->buffer) && flag) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1596 XBUFFER (w->buffer)->clip_changed = 0; |
277 | 1597 |
485 | 1598 if (!NILP (w->vchild)) |
277 | 1599 mark_window_display_accurate (w->vchild, flag); |
485 | 1600 if (!NILP (w->hchild)) |
277 | 1601 mark_window_display_accurate (w->hchild, flag); |
1602 } | |
1603 | |
1604 if (flag) | |
1605 { | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
1606 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); |
277 | 1607 last_arrow_string = Voverlay_arrow_string; |
1608 } | |
1609 else | |
1610 { | |
1611 /* t is unequal to any useful value of Voverlay_arrow_... */ | |
1612 last_arrow_position = Qt; | |
1613 last_arrow_string = Qt; | |
1614 } | |
1615 } | |
1616 | |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1617 /* 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
|
1618 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
|
1619 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
|
1620 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1621 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
|
1622 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1623 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1624 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
|
1625 FRAME_PTR f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1626 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1627 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1628 struct buffer *old = current_buffer; |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1629 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1630 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
|
1631 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1632 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1633 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1634 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1635 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1636 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1637 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
1638 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
|
1639 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
1640 #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
|
1641 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
|
1642 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1643 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
|
1644 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
1645 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1646 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1647 /* 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
|
1648 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
|
1649 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
|
1650 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
|
1651 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
|
1652 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
|
1653 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1654 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
|
1655 || !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
|
1656 || ((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
|
1657 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1658 != !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
|
1659 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
1660 && !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
|
1661 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1662 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1663 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
|
1664 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
|
1665 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
1666 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
|
1667 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
1668 record_unwind_protect (Fset_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
|
1669 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1670 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1671 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1672 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
1673 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1674 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1675 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1676 call1 (Vrun_hooks, Qactivate_menubar_hook); |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1677 /* 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
|
1678 really recompute the menubar from the value. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1679 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
1680 call0 (Qrecompute_lucid_menubar); |
14299 | 1681 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
|
1682 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
|
1683 /* 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
|
1684 #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
|
1685 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
|
1686 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
|
1687 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1688 /* 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
|
1689 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
|
1690 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1691 #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
|
1692 /* 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
|
1693 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
|
1694 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
1695 #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
|
1696 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
1697 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
|
1698 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1699 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1700 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1701 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1702 |
277 | 1703 int do_id = 1; |
1704 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1705 /* Redisplay WINDOW and its subwindows and siblings. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1706 |
277 | 1707 static void |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1708 redisplay_windows (window, preserve_echo_area) |
277 | 1709 Lisp_Object window; |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1710 int preserve_echo_area; |
277 | 1711 { |
485 | 1712 for (; !NILP (window); window = XWINDOW (window)->next) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1713 redisplay_window (window, 0, preserve_echo_area); |
277 | 1714 } |
1715 | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1716 /* 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
|
1717 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
|
1718 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
|
1719 macro DISP_CHAR_VECTOR. */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1720 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1721 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
|
1722 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
|
1723 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1724 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1725 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1726 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1727 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1728 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
|
1729 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1730 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
|
1731 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
|
1732 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1733 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
|
1734 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
|
1735 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1736 /* 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
|
1737 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
|
1738 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
|
1739 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
|
1740 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1741 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1742 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1743 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
|
1744 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1745 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
|
1746 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
|
1747 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
|
1748 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1749 /* 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
|
1750 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1751 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
1752 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1753 /* Redisplay window WINDOW and its subwindows. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1754 |
277 | 1755 static void |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1756 redisplay_window (window, just_this_one, preserve_echo_area) |
277 | 1757 Lisp_Object window; |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
1758 int just_this_one, preserve_echo_area; |
277 | 1759 { |
1760 register struct window *w = XWINDOW (window); | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1761 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 1762 int height; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1763 int lpoint = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1764 int lpoint_byte = PT_BYTE; |
277 | 1765 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
|
1766 register int width = window_internal_width (w) - 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1767 register int startp, startp_byte; |
277 | 1768 register int hscroll = XINT (w->hscroll); |
1769 struct position pos; | |
6705 | 1770 int opoint = PT; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1771 int opoint_byte = PT_BYTE; |
277 | 1772 int tem; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1773 int update_mode_line; |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1774 struct Lisp_Char_Table *dp = window_display_table (w); |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1775 int really_switched_buffer = 0; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1776 int count = specpdl_ptr - specpdl; |
277 | 1777 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1778 if (Z == Z_BYTE && lpoint != lpoint_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1779 abort (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1780 if (lpoint_byte < lpoint) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1781 abort (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1782 |
769 | 1783 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
277 | 1784 |
1785 /* If this is a combination window, do its children; that's all. */ | |
1786 | |
485 | 1787 if (!NILP (w->vchild)) |
277 | 1788 { |
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1789 redisplay_windows (w->vchild, preserve_echo_area); |
277 | 1790 return; |
1791 } | |
485 | 1792 if (!NILP (w->hchild)) |
277 | 1793 { |
14682
d5e14cf7a990
(redisplay_window): Pass preserve_echo_area as a missing
Richard M. Stallman <rms@gnu.org>
parents:
14662
diff
changeset
|
1794 redisplay_windows (w->hchild, preserve_echo_area); |
277 | 1795 return; |
1796 } | |
485 | 1797 if (NILP (w->buffer)) |
277 | 1798 abort (); |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1799 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1800 specbind (Qinhibit_point_motion_hooks, Qt); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
1801 |
433 | 1802 height = window_internal_height (w); |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1803 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
|
1804 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
|
1805 update_mode_line = 1; |
433 | 1806 |
1807 if (MINI_WINDOW_P (w)) | |
1808 { | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1809 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
|
1810 /* 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
|
1811 goto finish_scroll_bars; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1812 else if (w != XWINDOW (minibuf_window)) |
433 | 1813 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1814 /* 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
|
1815 so clear it. */ |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
1816 int vpos = XFASTINT (w->top); |
433 | 1817 int i; |
1818 | |
1819 for (i = 0; i < height; i++) | |
1820 { | |
769 | 1821 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
|
1822 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
|
1823 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
|
1824 0, 1, 0, width, 0); |
433 | 1825 } |
1826 | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1827 goto finish_scroll_bars; |
433 | 1828 } |
1829 } | |
277 | 1830 |
1831 /* Otherwise set up data on this window; select its buffer and point value */ | |
1832 | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1833 if (update_mode_line) |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1834 /* Really select the buffer, for the sake of buffer-local variables. */ |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1835 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1836 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1837 really_switched_buffer = 1; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1838 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1839 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1840 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
|
1841 |
6705 | 1842 opoint = PT; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1843 opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1844 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1845 if (Z == Z_BYTE && opoint != opoint_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1846 abort (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1847 if (opoint_byte < opoint) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1848 abort (); |
277 | 1849 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1850 /* 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
|
1851 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1852 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1853 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1854 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1855 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1856 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1857 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1858 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
1859 |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1860 /* 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
|
1861 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
|
1862 |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1863 if (!just_this_one) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1864 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1865 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1866 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1867 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
|
1868 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1869 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1870 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1871 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1872 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1873 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1874 } |
277 | 1875 |
1876 /* POINT refers normally to the selected window. | |
1877 For any other window, set up appropriate value. */ | |
1878 | |
1879 if (!EQ (window, selected_window)) | |
1880 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1881 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1882 int new_pt_byte = marker_byte_position (w->pointm); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1883 if (new_pt < BEGV) |
277 | 1884 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1885 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1886 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1887 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 1888 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1889 else if (new_pt > (ZV - 1)) |
277 | 1890 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1891 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1892 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1893 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 1894 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1895 /* We don't use SET_PT so that the point-motion hooks don't run. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1896 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 1897 } |
1898 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1899 /* 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
|
1900 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
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
1906 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
|
1907 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1908 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
|
1909 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
|
1910 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1911 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
|
1912 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
|
1913 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1914 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
|
1915 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1916 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1917 |
277 | 1918 /* If window-start is screwed up, choose a new one. */ |
1919 if (XMARKER (w->start)->buffer != current_buffer) | |
1920 goto recenter; | |
1921 | |
1922 startp = marker_position (w->start); | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1923 startp_byte = marker_byte_position (w->start); |
277 | 1924 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1925 /* 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
|
1926 check whether it can be used. */ |
22148
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
1927 if (!NILP (w->optional_new_start) |
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
1928 && startp >= BEGV && startp <= ZV) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1929 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1930 w->optional_new_start = Qnil; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1931 /* 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
|
1932 |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1933 pos = *compute_motion (startp, 0, |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1934 (((EQ (window, minibuf_window) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1935 && startp == BEG) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1936 ? minibuf_prompt_width : 0) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1937 + (hscroll ? 1 - hscroll : 0)), |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1938 0, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1939 PT, height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1940 /* BUG FIX: See the comment of |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1941 Fpos_visible_in_window_p (window.c). */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
1942 - (1 << (BITS_PER_SHORT - 1)), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1943 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1944 pos_tab_offset (w, startp, startp_byte), w); |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1945 /* 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
|
1946 so do so by setting force_start. */ |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1947 if (pos.bufpos == PT) |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1948 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1949 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
1950 |
433 | 1951 /* 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
|
1952 unless the specified location is outside the accessible range. */ |
485 | 1953 if (!NILP (w->force_start)) |
277 | 1954 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1955 w->force_start = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1956 /* 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
|
1957 w->base_line_number = Qnil; |
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
1958 /* The old bottom-of-screen position is no longer valid. */ |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
1959 w->window_end_valid = Qnil; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1960 /* 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
|
1961 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
|
1962 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
1963 /* 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
|
1964 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
|
1965 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
|
1966 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
|
1967 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1968 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1969 { |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1970 Lisp_Object temp[3]; |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
1971 |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1972 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1973 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1974 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1975 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1976 } |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
1977 really_switched_buffer = 1; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1978 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1979 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
|
1980 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1981 { |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1982 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
|
1983 make_number (startp)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1984 startp = marker_position (w->start); |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
1985 startp_byte = marker_byte_position (w->start); |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
1986 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1987 } |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1988 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
1989 XSETFASTINT (w->last_overlay_modified, 0); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1990 if (startp < BEGV) startp = BEGV, startp_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
1991 if (startp > ZV) startp = ZV, startp = ZV_BYTE; |
277 | 1992 try_window (window, startp); |
1993 if (cursor_vpos < 0) | |
1994 { | |
1995 /* If point does not appear, move point so it does appear */ | |
1996 pos = *compute_motion (startp, 0, | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1997 (((EQ (window, minibuf_window) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1998 && startp == BEG) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
1999 ? minibuf_prompt_width : 0) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2000 + (hscroll ? 1 - hscroll : 0)), |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2001 0, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2002 ZV, height / 2, |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13266
diff
changeset
|
2003 - (1 << (BITS_PER_SHORT - 1)), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2004 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2005 pos_tab_offset (w, startp, startp_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2006 w); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2007 TEMP_SET_PT_BOTH (pos.bufpos, pos.bytepos); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2008 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2009 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
277 | 2010 else |
2011 { | |
5340
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
2012 if (current_buffer == old) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2013 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2014 lpoint = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2015 lpoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2016 } |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
2017 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
11810 | 2018 + minmax (0, pos.hpos, width)); |
769 | 2019 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
277 | 2020 } |
9218
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
2021 /* 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
|
2022 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
|
2023 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
|
2024 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2025 { |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2026 cancel_my_columns (XWINDOW (window)); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2027 try_window (window, startp); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
2028 } |
277 | 2029 } |
2030 goto done; | |
2031 } | |
2032 | |
2033 /* 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
|
2034 and it has not moved off the frame. */ |
277 | 2035 |
2036 /* This code is not used for minibuffer for the sake of | |
2037 the case of redisplaying to replace an echo area message; | |
2038 since in that case the minibuffer contents per se are usually unchanged. | |
2039 This code is of no real use in the minibuffer since | |
2040 the handling of this_line_bufpos, etc., | |
2041 in redisplay handles the same cases. */ | |
2042 | |
2043 if (XFASTINT (w->last_modified) >= MODIFF | |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2044 && 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
|
2045 && 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
|
2046 && (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
|
2047 /* 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
|
2048 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
|
2049 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
|
2050 && 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
|
2051 /* 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
|
2052 && !(!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
|
2053 && 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
|
2054 /* 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
|
2055 && 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
|
2056 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height) |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
2057 && !EQ (window, minibuf_window) |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2058 && (!MARKERP (Voverlay_arrow_position) |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2059 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
277 | 2060 { |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
2061 /* 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
|
2062 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2063 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
|
2064 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
|
2065 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
|
2066 |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2067 /* 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
|
2068 /* 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
|
2069 window edges have not changed. */ |
22011
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2070 if (PT == XFASTINT (w->last_point) && just_this_one |
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2071 /* If CURSOR_IN_ECHO_AREA, last_point_x and last_point_y |
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2072 refer to the echo area and are not related to this window. */ |
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2073 && ! cursor_in_echo_area) |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2074 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2075 pos.hpos = last_point_x; |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
2076 pos.vpos = last_point_y; |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2077 pos.bufpos = PT; |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2078 } |
19225
b7e0b35c59d0
(redisplay_window): Fix access to w->last_point{,_[xy]}.
Richard M. Stallman <rms@gnu.org>
parents:
19205
diff
changeset
|
2079 else if (PT > XFASTINT (w->last_point) |
22011
e849b602b425
(redisplay_window): Don't use last_point_x and last_point_y
Richard M. Stallman <rms@gnu.org>
parents:
21845
diff
changeset
|
2080 && ! cursor_in_echo_area |
19478
b2544c0eada8
(redisplay_window): Don't try using last_point_x
Richard M. Stallman <rms@gnu.org>
parents:
19375
diff
changeset
|
2081 && 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
|
2082 /* 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
|
2083 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
|
2084 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
|
2085 && !(last_point_x <= 0 && hscroll)) |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2086 { |
21290
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2087 int last_point = XFASTINT (w->last_point); |
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2088 int last_point_byte = CHAR_TO_BYTE (last_point); |
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2089 int tab_offset = (pos_tab_offset (w, last_point, last_point_byte) |
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2090 - (last_point_x + hscroll - !! hscroll)); |
21290
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2091 |
2601d6057ec6
(redisplay_window): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
21280
diff
changeset
|
2092 pos = *compute_motion (last_point, 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
|
2093 PT, height, |
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2094 /* BUG FIX: See the comment of |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2095 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
|
2096 - (1 << (BITS_PER_SHORT - 1)), |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2097 width, hscroll, |
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
2098 tab_offset, |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2099 w); |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2100 } |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2101 else |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2102 { |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2103 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
|
2104 PT, height, |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2105 /* BUG FIX: See the comment of |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2106 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
|
2107 - (1 << (BITS_PER_SHORT - 1)), |
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2108 width, hscroll, |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2109 pos_tab_offset (w, startp, startp_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2110 w); |
19015
533ccefb099d
(redisplay_window): When text has not changed,
Richard M. Stallman <rms@gnu.org>
parents:
18994
diff
changeset
|
2111 } |
277 | 2112 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2113 /* 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
|
2114 if (this_scroll_margin < 0) |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2115 this_scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2116 |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2117 if (XINT (w->height) < 4 * scroll_margin) |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2118 this_scroll_margin = XINT (w->height) / 4; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2119 |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2120 /* 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
|
2121 we are ok. */ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2122 if (pos.vpos < height - this_scroll_margin |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
2123 && (pos.vpos >= this_scroll_margin || startp == BEGV)) |
277 | 2124 { |
769 | 2125 /* Ok, point is still on frame */ |
2126 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
277 | 2127 { |
2128 /* 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
|
2129 FRAME_CURSOR_X (f) = (WINDOW_LEFT_MARGIN (w) |
11810 | 2130 + minmax (0, pos.hpos, width)); |
769 | 2131 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); |
277 | 2132 } |
2133 /* This doesn't do the trick, because if a window to the right of | |
2134 this one must be redisplayed, this does nothing because there | |
769 | 2135 is nothing in DesiredFrame yet, and then the other window is |
277 | 2136 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
|
2137 if (WINDOW_FULL_WIDTH_P (w)) |
277 | 2138 preserve_my_columns (w); |
2139 */ | |
20130
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2140 if (current_buffer->clip_changed |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2141 && ! NILP (Vwindow_scroll_functions)) |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2142 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2143 make_number (marker_position (w->start))); |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2144 |
277 | 2145 goto done; |
2146 } | |
2147 /* Don't bother trying redisplay with same start; | |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2148 we already know it will lose. */ |
277 | 2149 } |
2150 /* If current starting point was originally the beginning of a line | |
2151 but no longer is, find a new starting point. */ | |
485 | 2152 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
|
2153 && !(startp <= BEGV |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2154 || FETCH_BYTE (startp_byte - 1) == '\n')) |
277 | 2155 { |
2156 goto recenter; | |
2157 } | |
2158 else if (just_this_one && !MINI_WINDOW_P (w) | |
6705 | 2159 && PT >= startp |
277 | 2160 && 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
|
2161 /* 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
|
2162 && ! NILP (w->start_at_line_beg) |
277 | 2163 && ! 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
|
2164 && do_id && !current_buffer->clip_changed |
277 | 2165 && !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
|
2166 && 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
|
2167 /* 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
|
2168 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2169 && !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
|
2170 /* 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
|
2171 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
|
2172 && !(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
|
2173 && NILP (w->region_showing) |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
2174 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 2175 && EQ (last_arrow_string, Voverlay_arrow_string) |
769 | 2176 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f))) |
277 | 2177 && tem != -2) |
2178 { | |
2179 /* tem > 0 means success. tem == -1 means choose new start. | |
2180 tem == -2 means try again with same start, | |
2181 and nothing but whitespace follows the changed stuff. | |
2182 tem == 0 means try again with same start. */ | |
2183 if (tem > 0) | |
2184 goto done; | |
2185 } | |
2186 else if (startp >= BEGV && startp <= ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2187 && (startp < ZV |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2188 /* Avoid starting at end of buffer. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2189 #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
|
2190 It will have to be considered later. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2191 || ! EQ (window, selected_window) |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2192 /* Don't do the recentering if redisplay |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2193 is not for no user action. */ |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2194 || preserve_echo_area |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2195 #endif |
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
2196 || startp == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2197 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2198 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 2199 { |
2200 /* Try to redisplay starting at same place as before */ | |
769 | 2201 /* If point has not moved off frame, accept the results */ |
277 | 2202 try_window (window, startp); |
2203 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2204 { |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2205 if (!just_this_one || current_buffer->clip_changed |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2206 || beg_unchanged < startp) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2207 /* 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
|
2208 w->base_line_number = Qnil; |
20130
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2209 |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2210 if (current_buffer->clip_changed |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2211 && ! NILP (Vwindow_scroll_functions)) |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2212 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2213 make_number (marker_position (w->start))); |
422958809490
(redisplay_window): If clip_changed, always run
Karl Heuer <kwzh@gnu.org>
parents:
20039
diff
changeset
|
2214 |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2215 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2216 } |
277 | 2217 else |
2218 cancel_my_columns (w); | |
2219 } | |
2220 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2221 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
2222 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
|
2223 /* 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
|
2224 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2225 { |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2226 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2227 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2228 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2229 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2230 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2231 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2232 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2233 } |
277 | 2234 |
2235 /* Try to scroll by specified few lines */ | |
2236 | |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2237 if ((scroll_conservatively || scroll_step) |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2238 && !current_buffer->clip_changed |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2239 && startp >= BEGV && startp <= ZV) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2240 { |
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2241 int this_scroll_margin = scroll_margin; |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2242 int scroll_margin_pos, scroll_margin_bytepos; |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2243 int scroll_max = scroll_step; |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2244 Lisp_Object ltemp; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2245 |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2246 if (scroll_conservatively) |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2247 scroll_max = scroll_conservatively; |
16570
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2248 |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2249 /* 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
|
2250 if (this_scroll_margin < 0) |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2251 this_scroll_margin = 0; |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2252 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2253 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
|
2254 this_scroll_margin = XINT (w->height) / 4; |
f1f1c509a8f2
(redisplay_window): When handling scroll_conservatively,
Richard M. Stallman <rms@gnu.org>
parents:
16560
diff
changeset
|
2255 |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2256 ltemp = Fwindow_end (window, Qt); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2257 scroll_margin_pos = XINT (ltemp); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
2258 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2259 if (this_scroll_margin) |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2260 { |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2261 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
|
2262 scroll_margin_pos = pos.bufpos; |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2263 scroll_margin_bytepos = pos.bytepos; |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2264 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2265 else |
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2266 scroll_margin_bytepos = CHAR_TO_BYTE (scroll_margin_pos); |
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2267 |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2268 if (PT >= scroll_margin_pos) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2269 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2270 struct position pos; |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2271 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
|
2272 PT, XFASTINT (w->height), 0, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2273 XFASTINT (w->width), XFASTINT (w->hscroll), |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2274 pos_tab_offset (w, scroll_margin_pos, |
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2275 scroll_margin_bytepos), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2276 w); |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2277 if (pos.vpos >= scroll_max) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2278 goto scroll_fail_1; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2279 |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2280 pos = *vmotion (startp, |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2281 scroll_conservatively ? pos.vpos + 1 : scroll_step, |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2282 w); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2283 |
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2284 /* The old bottom-of-screen position is no longer valid. */ |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2285 w->window_end_valid = Qnil; |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2286 if (! NILP (Vwindow_scroll_functions)) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2287 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2288 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2289 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2290 make_number (pos.bufpos)); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2291 pos.bufpos = marker_position (w->start); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2292 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2293 try_window (window, pos.bufpos); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2294 if (cursor_vpos >= 0) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2295 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2296 if (!just_this_one || current_buffer->clip_changed |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2297 || beg_unchanged < startp) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2298 /* Forget any recorded base line for line number display. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2299 w->base_line_number = Qnil; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2300 goto done; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2301 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2302 else |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2303 cancel_my_columns (w); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2304 } |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2305 |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2306 scroll_margin_pos = startp; |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2307 if (this_scroll_margin) |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2308 { |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2309 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
|
2310 scroll_margin_pos = pos.bufpos; |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2311 } |
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
2312 if (PT < scroll_margin_pos) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2313 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2314 struct position pos; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2315 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
|
2316 scroll_margin_pos, XFASTINT (w->height), 0, |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2317 XFASTINT (w->width), XFASTINT (w->hscroll), |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
2318 pos_tab_offset (w, PT, PT_BYTE), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2319 w); |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2320 if (pos.vpos > scroll_max) |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2321 goto scroll_fail_1; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2322 |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2323 pos = *vmotion (startp, |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2324 scroll_conservatively ? -pos.vpos : - scroll_step, |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2325 w); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2326 |
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2327 /* The old bottom-of-screen position is no longer valid. */ |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2328 w->window_end_valid = Qnil; |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2329 if (! NILP (Vwindow_scroll_functions)) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2330 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2331 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2332 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2333 make_number (pos.bufpos)); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2334 pos.bufpos = marker_position (w->start); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2335 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2336 try_window (window, pos.bufpos); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2337 if (cursor_vpos >= 0) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2338 { |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2339 if (!just_this_one || current_buffer->clip_changed |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2340 || beg_unchanged < startp) |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2341 /* Forget any recorded base line for line number display. */ |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2342 w->base_line_number = Qnil; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2343 goto done; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2344 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2345 else |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2346 cancel_my_columns (w); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2347 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2348 scroll_fail_1: ; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2349 } |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
2350 |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2351 #if 0 |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2352 if (scroll_step && ! scroll_margin && !current_buffer->clip_changed |
13760
7c7cc29b994e
(redisplay_window): Don't do the scroll_step thing
Karl Heuer <kwzh@gnu.org>
parents:
13733
diff
changeset
|
2353 && startp >= BEGV && startp <= ZV) |
277 | 2354 { |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2355 if (margin_call == 0) |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2356 margin_call = (PT > startp ? 1 : -1); |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2357 if (margin_call > 0) |
277 | 2358 { |
11810 | 2359 pos = *vmotion (Z - XFASTINT (w->window_end_pos), scroll_step, w); |
277 | 2360 if (pos.vpos >= height) |
2361 goto scroll_fail; | |
2362 } | |
2363 | |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2364 pos = *vmotion (startp, (margin_call < 0 ? - scroll_step : scroll_step), |
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2365 w); |
277 | 2366 |
6705 | 2367 if (PT >= pos.bufpos) |
277 | 2368 { |
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2369 /* The old bottom-of-screen position is no longer valid. */ |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2370 w->window_end_valid = Qnil; |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2371 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2372 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2373 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2374 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2375 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
|
2376 make_number (pos.bufpos)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2377 pos.bufpos = marker_position (w->start); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2378 } |
277 | 2379 try_window (window, pos.bufpos); |
2380 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2381 { |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2382 if (!just_this_one || current_buffer->clip_changed |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
2383 || beg_unchanged < startp) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2384 /* 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
|
2385 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2386 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2387 } |
277 | 2388 else |
2389 cancel_my_columns (w); | |
2390 } | |
2391 scroll_fail: ; | |
2392 } | |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
2393 #endif |
277 | 2394 |
2395 /* Finally, just choose place to start which centers point */ | |
2396 | |
2397 recenter: | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2398 /* 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
|
2399 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2400 |
11810 | 2401 pos = *vmotion (PT, - (height / 2), w); |
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2402 |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2403 /* The minibuffer is often just one line. Ordinary scrolling |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2404 gives little overlap and looks bad. So show 20 chars before point. */ |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2405 if (height == 1 |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2406 && (pos.bufpos >= PT - minibuffer_scroll_overlap |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2407 /* If we scrolled less than 1/2 line forward, we will |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2408 get too much overlap, so change to the usual amount. */ |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2409 || pos.bufpos < startp + width / 2) |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2410 && PT > BEGV + minibuffer_scroll_overlap |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2411 /* If we scrolled to an actual line boundary, |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2412 that's different; don't ignore line boundaries. */ |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2413 && FETCH_BYTE (pos.bytepos - 1) != '\n') |
20580
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2414 { |
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2415 pos.bufpos = PT - minibuffer_scroll_overlap; |
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2416 pos.bytepos = CHAR_TO_BYTE (pos.bufpos); |
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2417 } |
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
2418 |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
2419 /* 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
|
2420 in case the window-scroll-functions functions get errors. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2421 set_marker_both (w->start, Qnil, pos.bufpos, pos.bytepos); |
23417
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2422 |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2423 /* The old bottom-of-screen position is no longer valid. */ |
5e25a31007e8
(redisplay_window): Clear w->window_end_valid
Richard M. Stallman <rms@gnu.org>
parents:
23257
diff
changeset
|
2424 w->window_end_valid = Qnil; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
2425 if (! NILP (Vwindow_scroll_functions)) |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2426 { |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2427 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
|
2428 make_number (pos.bufpos)); |
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2429 pos.bufpos = marker_position (w->start); |
20580
5cf53b5a6bde
(redisplay_window): Set pos.bytepos along with pos.bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20536
diff
changeset
|
2430 pos.bytepos = marker_byte_position (w->start); |
14614
8fda783ead43
(redisplay_window): If window-scroll-functions change
Karl Heuer <kwzh@gnu.org>
parents:
14559
diff
changeset
|
2431 } |
277 | 2432 try_window (window, pos.bufpos); |
2433 | |
2434 startp = marker_position (w->start); | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2435 startp_byte = marker_byte_position (w->start); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2436 w->start_at_line_beg |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2437 = (startp == BEGV || FETCH_BYTE (startp_byte - 1) == '\n') ? Qt : Qnil; |
277 | 2438 |
2439 done: | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2440 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2441 /* 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
|
2442 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
|
2443 || (!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
|
2444 || 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
|
2445 || (!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
|
2446 && XFASTINT (w->column_number_displayed) != current_column ())) |
277 | 2447 && height != XFASTINT (w->height)) |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2448 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2449 FRAME_PTR oframe = selected_frame; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2450 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2451 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2452 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2453 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2454 really_switched_buffer = 1; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2455 } |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2456 selected_frame = f; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2457 display_mode_line (w); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2458 selected_frame = oframe; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2459 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2460 if (! line_number_displayed |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2461 && ! BUFFERP (w->base_line_pos)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2462 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2463 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2464 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2465 } |
277 | 2466 |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2467 /* 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
|
2468 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
|
2469 && (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
|
2470 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
2471 #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
|
2472 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
|
2473 #else |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2474 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
|
2475 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2476 : FRAME_MENU_BAR_LINES (f) > 0) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2477 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2478 display_menu_bar (w); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2479 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2480 finish_scroll_bars: |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2481 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
|
2482 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2483 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2484 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2485 /* 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
|
2486 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
|
2487 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
|
2488 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
|
2489 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2490 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2491 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
|
2492 if (! MINI_WINDOW_P (w) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2493 || (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
|
2494 { |
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
|
2495 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2496 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
|
2497 /* 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
|
2498 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
|
2499 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
|
2500 |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
2501 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
|
2502 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
|
2503 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2504 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2505 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2506 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2507 /* 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
|
2508 (*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
|
2509 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2510 /* 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
|
2511 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
|
2512 (*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
|
2513 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2514 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2515 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
2516 if (really_switched_buffer) |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
2517 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
|
2518 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
2519 set_buffer_temp (old); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2520 TEMP_SET_PT_BOTH (lpoint, lpoint_byte); |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
2521 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
2522 unbind_to (count, Qnil); |
277 | 2523 } |
2524 | |
2525 /* Do full redisplay on one window, starting at position `pos'. */ | |
2526 | |
2527 static void | |
2528 try_window (window, pos) | |
2529 Lisp_Object window; | |
2530 register int pos; | |
2531 { | |
2532 register struct window *w = XWINDOW (window); | |
2533 register int height = window_internal_height (w); | |
2534 register int vpos = XFASTINT (w->top); | |
2535 register int last_text_vpos = vpos; | |
769 | 2536 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
|
2537 int width = window_internal_width (w) - 1; |
277 | 2538 struct position val; |
2539 | |
16738
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2540 /* 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
|
2541 if (pos < XBUFFER (w->buffer)->begv |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2542 || pos > XBUFFER (w->buffer)->zv) |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2543 abort (); |
9372cff55355
(try_window): Add error check for POS.
Richard M. Stallman <rms@gnu.org>
parents:
16660
diff
changeset
|
2544 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2545 if (XMARKER (w->start)->charpos != pos) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2546 Fset_marker (w->start, make_number (pos), Qnil); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2547 |
277 | 2548 cursor_vpos = -1; |
2549 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2550 zv_strings_seen = 0; |
277 | 2551 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
|
2552 val.ovstring_chars_done = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2553 val.bytepos = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2554 val.tab_offset = pos_tab_offset (w, pos, val.bytepos); |
277 | 2555 |
2556 while (--height >= 0) | |
2557 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2558 val = *display_text_line (w, pos, val.bytepos, vpos, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2559 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
|
2560 val.ovstring_chars_done); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2561 /* 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
|
2562 in VAL. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2563 #if 0 |
277 | 2564 tab_offset += width; |
2565 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2566 #endif /* 0 */ |
277 | 2567 vpos++; |
2568 if (pos != val.bufpos) | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2569 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2570 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
|
2571 #ifdef USE_TEXT_PROPERTIES |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2572 Lisp_Object invis_prop; |
21534
7784f9b030a8
(try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
2573 invis_prop = Fget_char_property (make_number (val.bufpos - 1), |
7784f9b030a8
(try_window): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
2574 Qinvisible, window); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2575 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
|
2576 #endif |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2577 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2578 last_text_vpos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2579 /* 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
|
2580 = vpos - (val.vpos |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2581 && (FETCH_BYTE (val.bytepos - 1) != '\n' || invis)); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2582 } |
277 | 2583 pos = val.bufpos; |
2584 } | |
2585 | |
2586 /* If last line is continued in middle of character, | |
769 | 2587 include the split character in the text considered on the frame */ |
277 | 2588 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
2589 pos++; | |
2590 | |
769 | 2591 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 2592 if (XFASTINT (w->window_end_pos) == 0 |
2593 && Z != pos) | |
2594 w->update_mode_line = Qt; | |
2595 | |
769 | 2596 /* 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
|
2597 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
|
2598 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top)); |
277 | 2599 /* But that is not valid info until redisplay finishes. */ |
2600 w->window_end_valid = Qnil; | |
2601 } | |
2602 | |
2603 /* Try to redisplay when buffer is modified locally, | |
2604 computing insert/delete line to preserve text outside | |
2605 the bounds of the changes. | |
2606 Return 1 if successful, 0 if if cannot tell what to do, | |
2607 or -1 to tell caller to find a new window start, | |
2608 or -2 to tell caller to do normal redisplay with same window start. */ | |
2609 | |
2610 static int | |
2611 try_window_id (window) | |
2612 Lisp_Object window; | |
2613 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2614 int pos, pos_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2615 int opoint, opoint_byte; |
277 | 2616 register struct window *w = XWINDOW (window); |
2617 register int height = window_internal_height (w); | |
769 | 2618 FRAME_PTR f = XFRAME (w->frame); |
277 | 2619 int top = XFASTINT (w->top); |
2620 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
|
2621 int width = window_internal_width (w) - 1; |
277 | 2622 int hscroll = XINT (w->hscroll); |
2623 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2624 int did_motion; |
277 | 2625 register int vpos; |
2626 register int i, tem; | |
2627 int last_text_vpos = 0; | |
2628 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
|
2629 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
|
2630 ? 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
|
2631 : !NILP (current_buffer->selective_display) ? -1 : 0); |
277 | 2632 struct position val, bp, ep, xp, pp; |
2633 int scroll_amount = 0; | |
2634 int delta; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2635 int epto, old_tick; |
277 | 2636 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2637 int start_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2638 |
277 | 2639 if (GPT - BEG < beg_unchanged) |
2640 beg_unchanged = GPT - BEG; | |
2641 if (Z - GPT < end_unchanged) | |
2642 end_unchanged = Z - GPT; | |
2643 | |
5739
0709eb474647
(try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
5676
diff
changeset
|
2644 if (beg_unchanged + BEG < start) |
277 | 2645 return 0; /* Give up if changes go above top of window */ |
2646 | |
2647 /* Find position before which nothing is changed. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2648 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
|
2649 min (ZV, beg_unchanged + BEG), height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2650 /* BUG FIX: See the comment of |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2651 Fpos_visible_in_window_p (window.c). */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2652 - (1 << (BITS_PER_SHORT - 1)), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2653 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2654 pos_tab_offset (w, start, start_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2655 w); |
277 | 2656 if (bp.vpos >= height) |
368 | 2657 { |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
2658 if (PT < bp.bufpos) |
368 | 2659 { |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
2660 /* 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
|
2661 We don't need to change the text at all. |
368 | 2662 But we need to update window_end_pos to account for |
2663 any change in buffer size. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2664 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
|
2665 ZV, height, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2666 /* BUG FIX: See the comment of |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2667 Fpos_visible_in_window_p() (window.c). */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2668 - (1 << (BITS_PER_SHORT - 1)), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2669 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2670 pos_tab_offset (w, start, start_byte), w); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2671 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
|
2672 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
|
2673 goto findpoint; |
368 | 2674 } |
2675 return 0; | |
2676 } | |
277 | 2677 |
2678 vpos = bp.vpos; | |
2679 | |
769 | 2680 /* Find beginning of that frame line. Must display from there. */ |
11810 | 2681 bp = *vmotion (bp.bufpos, 0, w); |
277 | 2682 |
2683 pos = bp.bufpos; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2684 pos_byte = bp.bytepos; |
277 | 2685 val.hpos = lmargin; |
2686 if (pos < start) | |
2687 return -1; | |
2688 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2689 did_motion = 0; |
277 | 2690 /* If about to start displaying at the beginning of a continuation line, |
769 | 2691 really start with previous frame line, in case it was not |
277 | 2692 continued when last redisplayed */ |
528 | 2693 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0) |
2694 || | |
2695 /* 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
|
2696 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0)) |
277 | 2697 { |
11810 | 2698 bp = *vmotion (bp.bufpos, -1, w); |
277 | 2699 --vpos; |
2700 pos = bp.bufpos; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2701 pos_byte = bp.bytepos; |
277 | 2702 } |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2703 val.tab_offset = bp.tab_offset; /* Update tab offset. */ |
277 | 2704 |
2705 if (bp.contin && bp.hpos != lmargin) | |
2706 { | |
2707 val.hpos = bp.prevhpos - width + lmargin; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2708 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
|
2709 did_motion = 1; |
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
2710 DEC_BOTH (pos, pos_byte); |
277 | 2711 } |
2712 | |
2713 bp.vpos = vpos; | |
2714 | |
2715 /* Find first visible newline after which no more is changed. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2716 opoint = PT, opoint_byte = PT_BYTE; |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
2717 TEMP_SET_PT (Z - max (end_unchanged, Z - ZV)); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2718 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2719 if (selective > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2720 while (PT < ZV - 1 && indented_beyond_p (PT, PT_BYTE, selective)) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2721 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2722 tem = PT; |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
2723 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
277 | 2724 |
2725 /* Compute the cursor position after that newline. */ | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2726 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
|
2727 height, - (1 << (BITS_PER_SHORT - 1)), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2728 width, hscroll, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2729 /* 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
|
2730 val.tab_offset, w); |
277 | 2731 |
769 | 2732 /* If changes reach past the text available on the frame, |
2733 just display rest of frame. */ | |
277 | 2734 if (ep.bufpos > Z - XFASTINT (w->window_end_pos)) |
2735 stop_vpos = height; | |
2736 else | |
2737 stop_vpos = ep.vpos; | |
2738 | |
2739 /* If no newline before ep, the line ep is on includes some changes | |
2740 that must be displayed. Make sure we don't stop before it. */ | |
2741 /* Also, if changes reach all the way until ep.bufpos, | |
2742 it is possible that something was deleted after the | |
2743 newline before it, so the following line must be redrawn. */ | |
2744 if (stop_vpos == ep.vpos | |
2745 && (ep.bufpos == BEGV | |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2746 || FETCH_BYTE (ep.bytepos - 1) != '\n' |
277 | 2747 || ep.bufpos == Z - end_unchanged)) |
2748 stop_vpos = ep.vpos + 1; | |
2749 | |
2750 cursor_vpos = -1; | |
2751 overlay_arrow_seen = 0; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2752 zv_strings_seen = 0; |
277 | 2753 |
2754 /* If changes do not reach to bottom of window, | |
2755 figure out how much to scroll the rest of the window */ | |
2756 if (stop_vpos < height) | |
2757 { | |
2758 /* 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
|
2759 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, 1, |
277 | 2760 Z - XFASTINT (w->window_end_pos), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2761 /* Don't care for VPOS... */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2762 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2763 /* ... nor HPOS. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2764 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2765 width, hscroll, ep.tab_offset, w); |
277 | 2766 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos); |
2767 | |
769 | 2768 /* Is everything on frame below the changes whitespace? |
277 | 2769 If so, no scrolling is really necessary. */ |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2770 for (i = ep.bytepos; i < xp.bytepos; i++) |
277 | 2771 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2772 tem = FETCH_BYTE (i); |
277 | 2773 if (tem != ' ' && tem != '\n' && tem != '\t') |
2774 break; | |
2775 } | |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2776 if (i == xp.bytepos) |
277 | 2777 return -2; |
2778 | |
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
2779 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
|
2780 XFASTINT (w->window_end_vpos) + scroll_amount); |
277 | 2781 |
769 | 2782 /* 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
|
2783 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.vpos < height)) |
277 | 2784 { |
6705 | 2785 if (PT <= xp.bufpos) |
277 | 2786 { |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2787 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
|
2788 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
|
2789 width, hscroll, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2790 /* 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
|
2791 ep.tab_offset, w); |
277 | 2792 } |
2793 else | |
2794 { | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
2795 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
|
2796 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
|
2797 width, hscroll, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2798 /* 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
|
2799 xp.tab_offset, w); |
277 | 2800 } |
6705 | 2801 if (pp.bufpos < PT || pp.vpos == height) |
277 | 2802 return 0; |
2803 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
|
2804 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, pp.hpos, width); |
277 | 2805 } |
2806 | |
2807 if (stop_vpos - scroll_amount >= height | |
2808 || ep.bufpos == xp.bufpos) | |
2809 { | |
2810 if (scroll_amount < 0) | |
2811 stop_vpos -= scroll_amount; | |
2812 scroll_amount = 0; | |
2813 /* In this path, we have altered window_end_vpos | |
2814 and not left it negative. | |
2815 We must make sure that, in case display is preempted | |
769 | 2816 before the frame changes to reflect what we do here, |
277 | 2817 further updates will not come to try_window_id |
769 | 2818 and assume the frame and window_end_vpos match. */ |
277 | 2819 blank_end_of_window = 1; |
2820 } | |
2821 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
|
2822 { |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
2823 /* 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
|
2824 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
|
2825 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
|
2826 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
|
2827 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
|
2828 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
|
2829 } |
277 | 2830 else if (bp.bufpos == Z - end_unchanged) |
2831 { | |
2832 /* If reprinting everything is nearly as fast as scrolling, | |
2833 don't bother scrolling. Can happen if lines are short. */ | |
769 | 2834 if (scroll_cost (f, bp.vpos + top - scroll_amount, |
277 | 2835 top + height - max (0, scroll_amount), |
2836 scroll_amount) | |
2837 > xp.bufpos - bp.bufpos - 20) | |
2838 /* Return "try normal display with same window-start." | |
2839 Too bad we can't prevent further scroll-thinking. */ | |
2840 return -2; | |
2841 /* If pure deletion, scroll up as many lines as possible. | |
2842 In common case of killing a line, this can save the | |
2843 following line from being overwritten by scrolling | |
2844 and therefore having to be redrawn. */ | |
769 | 2845 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
|
2846 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
|
2847 scroll_amount, bp.bufpos); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2848 if (!tem) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2849 stop_vpos = height; |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2850 else |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2851 { |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2852 /* 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
|
2853 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
|
2854 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
|
2855 (This can happen in a deletion that ends in mid-line.) |
14036 | 2856 To adjust properly, we need to make things consistent |
2857 at the position ep. | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2858 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
|
2859 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
|
2860 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
|
2861 int oldstart |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2862 = 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
|
2863 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
|
2864 ep.bufpos - oldstart); |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2865 } |
277 | 2866 } |
2867 else if (scroll_amount) | |
2868 { | |
2869 /* If reprinting everything is nearly as fast as scrolling, | |
2870 don't bother scrolling. Can happen if lines are short. */ | |
2871 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an | |
2872 overestimate of cost of reprinting, since xp.bufpos | |
2873 would end up below the bottom of the window. */ | |
769 | 2874 if (scroll_cost (f, ep.vpos + top - scroll_amount, |
277 | 2875 top + height - max (0, scroll_amount), |
2876 scroll_amount) | |
2877 > xp.bufpos - ep.bufpos - 20) | |
2878 /* Return "try normal display with same window-start." | |
2879 Too bad we can't prevent further scroll-thinking. */ | |
2880 return -2; | |
769 | 2881 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount, |
277 | 2882 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
|
2883 scroll_amount, ep.bufpos); |
277 | 2884 if (!tem) stop_vpos = height; |
2885 } | |
2886 } | |
2887 | |
2888 /* In any case, do not display past bottom of window */ | |
2889 if (stop_vpos >= height) | |
2890 { | |
2891 stop_vpos = height; | |
2892 scroll_amount = 0; | |
2893 } | |
2894 | |
2895 /* Handle case where pos is before w->start -- | |
2896 can happen if part of line had been clipped and is not clipped now */ | |
2897 if (vpos == 0 && pos < marker_position (w->start)) | |
2898 Fset_marker (w->start, make_number (pos), Qnil); | |
2899 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2900 val.bytepos = pos_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2901 |
277 | 2902 /* Redisplay the lines where the text was changed */ |
2903 last_text_vpos = vpos; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2904 /* 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
|
2905 val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2906 #if 0 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2907 tab_offset = pos_tab_offset (w, pos, pos_byte); |
277 | 2908 /* If we are starting display in mid-character, correct tab_offset |
2909 to account for passing the line that that character really starts in. */ | |
2910 if (val.hpos < lmargin) | |
2911 tab_offset += width; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2912 #endif /* 0 */ |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2913 old_tick = MODIFF; |
277 | 2914 while (vpos < stop_vpos) |
2915 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2916 val = *display_text_line (w, pos, val.bytepos, top + vpos++, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2917 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
|
2918 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
|
2919 /* 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
|
2920 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
|
2921 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
|
2922 if (old_tick != MODIFF) |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
2923 stop_vpos = height; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2924 /* 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
|
2925 in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2926 #if 0 |
277 | 2927 tab_offset += width; |
2928 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2929 #endif |
277 | 2930 if (pos != val.bufpos) |
2931 last_text_vpos | |
2932 /* Next line, unless prev line ended in end of buffer with no cr */ | |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2933 = vpos - (val.vpos && FETCH_BYTE (val.bytepos - 1) != '\n'); |
277 | 2934 pos = val.bufpos; |
2935 } | |
2936 | |
2937 /* There are two cases: | |
2938 1) we have displayed down to the bottom of the window | |
2939 2) we have scrolled lines below stop_vpos by scroll_amount */ | |
2940 | |
2941 if (vpos == height) | |
2942 { | |
2943 /* If last line is continued in middle of character, | |
769 | 2944 include the split character in the text considered on the frame */ |
277 | 2945 if (val.hpos < lmargin) |
2946 val.bufpos++; | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2947 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
|
2948 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
277 | 2949 } |
2950 | |
2951 /* If scrolling made blank lines at window bottom, | |
2952 redisplay to fill those lines */ | |
2953 if (scroll_amount < 0) | |
2954 { | |
2955 /* Don't consider these lines for general-purpose scrolling. | |
2956 That will save time in the scrolling computation. */ | |
769 | 2957 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos; |
277 | 2958 vpos = xp.vpos; |
2959 pos = xp.bufpos; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2960 pos_byte = xp.bytepos; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2961 val.hpos = xp.hpos; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2962 val.tab_offset = xp.tab_offset; |
277 | 2963 if (pos == ZV) |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2964 { /* Display from next line */ |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2965 vpos = height + scroll_amount; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2966 val.hpos = lmargin; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2967 val.tab_offset = 0; |
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
2968 } |
277 | 2969 else if (xp.contin && xp.hpos != lmargin) |
2970 { | |
2971 val.hpos = xp.prevhpos - width + lmargin; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2972 val.tab_offset = xp.tab_offset + bp.prevhpos - width; |
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
2973 DEC_BOTH (pos, pos_byte); |
277 | 2974 } |
2975 | |
2976 blank_end_of_window = 1; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2977 /* 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
|
2978 in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2979 #if 0 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2980 tab_offset = pos_tab_offset (w, pos, pos_byte); |
277 | 2981 /* If we are starting display in mid-character, correct tab_offset |
2982 to account for passing the line that that character starts in. */ | |
2983 if (val.hpos < lmargin) | |
2984 tab_offset += width; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2985 #endif |
21280
82fbf42bb989
(redisplay_window): Give byte position to FETCH_BYTE.
Kenichi Handa <handa@m17n.org>
parents:
21244
diff
changeset
|
2986 val.bytepos = pos_byte; |
277 | 2987 while (vpos < height) |
2988 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2989 val = *display_text_line (w, pos, val.bytepos, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
2990 top + vpos++, val.hpos, |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2991 val.tab_offset, val.ovstring_chars_done); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2992 /* 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
|
2993 offset in val.tab_offset. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2994 #if 0 |
277 | 2995 tab_offset += width; |
2996 if (val.vpos) tab_offset = 0; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
2997 #endif /* 0 */ |
277 | 2998 pos = val.bufpos; |
2999 } | |
3000 | |
3001 /* Here is a case where display_text_line sets cursor_vpos wrong. | |
3002 Make it be fixed up, below. */ | |
3003 if (xp.bufpos == ZV | |
6705 | 3004 && xp.bufpos == PT) |
277 | 3005 cursor_vpos = -1; |
3006 } | |
3007 | |
769 | 3008 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 3009 if (XFASTINT (w->window_end_pos) == 0 |
3010 && Z != val.bufpos) | |
3011 w->update_mode_line = Qt; | |
3012 | |
3013 /* Attempt to adjust end-of-text positions to new bottom line */ | |
3014 if (scroll_amount) | |
3015 { | |
3016 delta = height - xp.vpos; | |
3017 if (delta < 0 | |
3018 || (delta > 0 && xp.bufpos <= ZV) | |
3019 || (delta == 0 && xp.hpos)) | |
3020 { | |
11810 | 3021 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
|
3022 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
|
3023 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
|
3024 XFASTINT (w->window_end_vpos) + val.vpos); |
277 | 3025 } |
3026 } | |
3027 | |
3028 w->window_end_valid = Qnil; | |
3029 | |
3030 /* If point was not in a line that was displayed, find it */ | |
3031 if (cursor_vpos < 0) | |
3032 { | |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
3033 findpoint: |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3034 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
|
3035 /* Don't care for VPOS... */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3036 1 << (BITS_PER_SHORT - 1), |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3037 /* ... nor HPOS. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3038 1 << (BITS_PER_SHORT - 1), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3039 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3040 pos_tab_offset (w, start, start_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3041 w); |
769 | 3042 /* Admit failure if point is off frame now */ |
277 | 3043 if (val.vpos >= height) |
3044 { | |
3045 for (vpos = 0; vpos < height; vpos++) | |
769 | 3046 cancel_line (vpos + top, f); |
277 | 3047 return 0; |
3048 } | |
3049 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
|
3050 cursor_hpos = WINDOW_LEFT_MARGIN (w) + minmax (0, val.hpos, width); |
277 | 3051 } |
3052 | |
11810 | 3053 FRAME_CURSOR_X (f) = cursor_hpos; |
769 | 3054 FRAME_CURSOR_Y (f) = cursor_vpos; |
277 | 3055 |
3056 if (debug_end_pos) | |
3057 { | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3058 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
|
3059 height, - (1 << (BITS_PER_SHORT - 1)), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3060 width, hscroll, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3061 pos_tab_offset (w, start, start_byte), |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3062 w); |
277 | 3063 if (val.vpos != XFASTINT (w->window_end_vpos)) |
3064 abort (); | |
3065 if (XFASTINT (w->window_end_pos) | |
3066 != Z - val.bufpos) | |
3067 abort (); | |
3068 } | |
3069 | |
3070 return 1; | |
3071 } | |
3072 | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3073 /* Copy LEN glyphs starting address FROM to the rope TO. |
301 | 3074 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
|
3075 Value is TO, advanced past the copied data. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3076 F is the frame we are displaying in. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3077 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3078 static GLYPH * |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3079 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
|
3080 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3081 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
|
3082 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
|
3083 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
|
3084 int len; |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3085 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
|
3086 { |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3087 int n = len; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3088 register Lisp_Object *fp = from; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3089 /* 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
|
3090 int last_code = -1; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3091 int last_merged = 0; |
277 | 3092 |
9572 | 3093 #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
|
3094 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
|
3095 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
|
3096 { |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3097 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
|
3098 int facecode; |
17179
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3099 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
|
3100 |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3101 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
|
3102 /* 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
|
3103 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
|
3104 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3105 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
|
3106 /* 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
|
3107 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
|
3108 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
|
3109 /* 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
|
3110 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
|
3111 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3112 { |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3113 /* 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
|
3114 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
|
3115 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
|
3116 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3117 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3118 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
|
3119 *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
|
3120 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3121 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3122 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3123 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3124 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3125 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
|
3126 { |
6741
840862375e93
(copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents:
6740
diff
changeset
|
3127 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
|
3128 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3129 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3130 } |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3131 return to; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3132 } |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3133 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3134 /* 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
|
3135 with a displayable computed face code. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3136 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3137 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
|
3138 fix_glyph (f, glyph, cface) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3139 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3140 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
|
3141 int cface; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3142 { |
9572 | 3143 #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
|
3144 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
|
3145 { |
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
|
3146 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
|
3147 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
|
3148 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
|
3149 } |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3150 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3151 return glyph; |
277 | 3152 } |
3153 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3154 /* Return the column of position POS / POS_BYTE in window W's buffer. |
21335
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3155 When used on the character at the beginning of a line, |
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3156 starting at column 0, this says how much to subtract from |
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3157 the column position of any character in the line |
8f9e7600c250
(redisplay_window): Fix computing pos from last_point.
Richard M. Stallman <rms@gnu.org>
parents:
21310
diff
changeset
|
3158 to get its horizontal position on the screen. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3159 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3160 static int |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3161 pos_tab_offset (w, pos, pos_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3162 struct window *w; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3163 register int pos, pos_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3164 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3165 int opoint = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3166 int opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3167 int col; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3168 int width = window_internal_width (w) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3169 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3170 if (pos == BEGV) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3171 return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3172 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3173 if (FETCH_BYTE (pos_byte - 1) == '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3174 return 0; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3175 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3176 TEMP_SET_PT_BOTH (pos, pos_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3177 col = current_column (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3178 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3179 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3180 return col; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3181 } |
22148
7110195b0127
(redisplay_window): Don't use window->start
Richard M. Stallman <rms@gnu.org>
parents:
22030
diff
changeset
|
3182 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3183 /* Display one line of window W, starting at char position START in W's buffer. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3184 START_BYTE is the corresponding byte position. |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3185 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3186 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
|
3187 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
|
3188 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
|
3189 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
|
3190 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
|
3191 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
|
3192 account. |
277 | 3193 |
3194 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations. | |
3195 | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3196 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
|
3197 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
|
3198 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3199 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
|
3200 the top of the frame, not W. |
277 | 3201 |
3202 Returns a STRUCT POSITION giving character to start next line with | |
3203 and where to display it, including a zero or negative hpos. | |
3204 The vpos field is not really a vpos; it is 1 unless the line is continued */ | |
3205 | |
3206 struct position val_display_text_line; | |
3207 | |
3208 static struct position * | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3209 display_text_line (w, start, start_byte, vpos, hpos, taboffset, ovstr_done) |
277 | 3210 struct window *w; |
3211 int start; | |
3212 int vpos; | |
3213 int hpos; | |
3214 int taboffset; | |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3215 int ovstr_done; |
277 | 3216 { |
3217 register int pos = start; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3218 int pos_byte = start_byte; |
277 | 3219 register int c; |
3220 register GLYPH *p1; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3221 int pause, limit_byte; |
277 | 3222 register unsigned char *p; |
3223 GLYPH *endp; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3224 register GLYPH *leftmargin; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3225 register GLYPH *p1prev; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3226 register GLYPH *p1start; |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3227 GLYPH *p1_wide_column_end = (GLYPH *) 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3228 int prevpos, prevpos_byte; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3229 int *charstart; |
769 | 3230 FRAME_PTR f = XFRAME (w->frame); |
277 | 3231 int tab_width = XINT (current_buffer->tab_width); |
485 | 3232 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
|
3233 int width = window_internal_width (w) - 1; |
277 | 3234 struct position val; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3235 int lastpos, lastpos_byte; |
277 | 3236 int invis; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3237 int last_invis_skip = 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3238 Lisp_Object last_invis_prop; |
277 | 3239 int hscroll = XINT (w->hscroll); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3240 int truncate = (hscroll |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3241 || (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
|
3242 && !WINDOW_FULL_WIDTH_P (w)) |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3243 || !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
|
3244 |
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3245 /* 1 if this buffer has a region to highlight. */ |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3246 int highlight_region |
16069
8fe5e69de92a
(redisplay_internal): Test last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3247 = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active) |
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3248 && XMARKER (current_buffer->mark)->buffer != 0); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3249 int region_beg, region_end; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3250 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3251 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
|
3252 ? 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
|
3253 : !NILP (current_buffer->selective_display) ? -1 : 0); |
769 | 3254 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
|
3255 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
|
3256 |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3257 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
|
3258 /* 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
|
3259 if it calls for an ellipsis. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3260 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
|
3261 selective display is enabled--you must check that separately. */ |
277 | 3262 int selective_rlen |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3263 = (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
|
3264 ? 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
|
3265 : !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
|
3266 /* 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
|
3267 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
|
3268 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
|
3269 = (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
|
3270 ? 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
|
3271 : default_invis_vector); |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3272 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3273 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
|
3274 || !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
|
3275 ? '$' : 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
|
3276 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
|
3277 || !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
|
3278 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp))); |
277 | 3279 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3280 /* If 1, we must handle multibyte characters. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3281 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
|
3282 /* Length of multibyte form of each character. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3283 int len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3284 /* 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
|
3285 displayed from right to left. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3286 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
|
3287 ? 0 : GLYPH_MASK_REV_DIR); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3288 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3289 /* 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
|
3290 to overlays or text property changes. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3291 int next_face_change; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3292 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3293 /* 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
|
3294 overlay starts or ends. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3295 int next_boundary; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3296 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3297 /* 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
|
3298 int current_face = 0; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3299 int i; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3300 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3301 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
|
3302 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
|
3303 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
3304 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
|
3305 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 3306 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3307 /* Show where to highlight the region. */ |
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3308 if (highlight_region |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
3309 /* 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
|
3310 && (highlight_nonselected_windows |
20258
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3311 || w == XWINDOW (selected_window) |
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3312 || (MINI_WINDOW_P (XWINDOW (selected_window)) |
ebebe05191b4
(display_text_line): Make decision about which windows
Karl Heuer <kwzh@gnu.org>
parents:
20130
diff
changeset
|
3313 && w == XWINDOW (Vminibuf_scroll_window)))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3314 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3315 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
|
3316 if (PT < region_beg) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3317 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3318 region_end = region_beg; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3319 region_beg = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3320 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3321 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3322 region_end = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3323 w->region_showing = Qt; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3324 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3325 else |
17679
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3326 { |
447ca1b334e5
(display_text_line): Clear region_showing to Qnil if the
Richard M. Stallman <rms@gnu.org>
parents:
17362
diff
changeset
|
3327 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
|
3328 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
|
3329 } |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
3330 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3331 if (MINI_WINDOW_P (w) |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3332 && start == BEG |
277 | 3333 && vpos == XFASTINT (w->top)) |
3334 { | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
3335 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
|
3336 { |
18994
015e9d877871
(display_text_line): Don't count minibuf_prompt_width twice in taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
18865
diff
changeset
|
3337 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
|
3338 |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3339 minibuf_prompt_width |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
3340 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
3341 STRING_BYTES (XSTRING (minibuf_prompt)), |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3342 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
|
3343 /* 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
|
3344 ' ', |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3345 1, -1, |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
3346 /* 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
|
3347 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
|
3348 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
|
3349 (XFASTINT (w->width) > 10 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
3350 ? XFASTINT (w->width) - 4 : -1), |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
3351 STRING_MULTIBYTE (minibuf_prompt)) |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3352 - 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
|
3353 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
|
3354 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
|
3355 } |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3356 else |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
3357 minibuf_prompt_width = 0; |
277 | 3358 } |
3359 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3360 /* 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
|
3361 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
|
3362 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
|
3363 if (hpos < 0) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3364 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3365 struct position *left_edge |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3366 = compute_motion (pos, vpos, hpos, 0, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3367 ZV, vpos, 0, |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3368 width, hscroll, taboffset, w); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3369 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3370 /* 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
|
3371 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
|
3372 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
|
3373 the left margin. |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3374 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3375 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
|
3376 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
|
3377 the line. If so, back up. */ |
23784
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3378 if ((left_edge->vpos > vpos |
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3379 || left_edge->hpos > 0) |
b09b3351386f
(display_text_line): When handling HPOS < 0 after loop,
Richard M. Stallman <rms@gnu.org>
parents:
23647
diff
changeset
|
3380 && left_edge->bufpos > pos) |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3381 { |
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
3382 pos = left_edge->bufpos; |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3383 pos_byte = left_edge->bytepos; |
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
3384 DEC_BOTH (pos, pos_byte); |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3385 hpos = left_edge->prevhpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3386 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3387 else |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3388 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3389 pos = left_edge->bufpos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3390 pos_byte = left_edge->bytepos; |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3391 hpos = left_edge->hpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3392 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3393 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3394 |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3395 hpos += WINDOW_LEFT_MARGIN (w); |
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
3396 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
3397 desired_glyphs->bufp[vpos] = start; |
277 | 3398 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
|
3399 p1start = p1; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3400 charstart = desired_glyphs->charstarts[vpos] + hpos; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3401 /* 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
|
3402 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
|
3403 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
|
3404 endp = leftmargin + width; |
277 | 3405 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3406 /* 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
|
3407 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
|
3408 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
|
3409 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
|
3410 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
|
3411 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
|
3412 |
277 | 3413 /* Loop generating characters. |
3414 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
|
3415 if reach or pass continuation column, |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3416 or at face change. */ |
277 | 3417 pause = pos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3418 limit_byte = pos_byte; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3419 next_face_change = pos; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3420 next_boundary = pos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3421 p1prev = p1; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3422 prevpos = pos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3423 prevpos_byte = pos_byte; |
18829
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3424 |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3425 /* 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
|
3426 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
|
3427 right away. */ |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3428 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
|
3429 { |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3430 cursor_vpos = vpos; |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3431 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
|
3432 } |
efc598630ee9
(display_text_line): Handle the case of point being in
Richard M. Stallman <rms@gnu.org>
parents:
18761
diff
changeset
|
3433 |
18730
492cb3baf591
(display_text_line): Exit the outer loop immediately
Richard M. Stallman <rms@gnu.org>
parents:
18718
diff
changeset
|
3434 while (p1 < endp) |
277 | 3435 { |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3436 if (pos >= pause) |
277 | 3437 { |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3438 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
|
3439 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3440 while (pos == next_boundary) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3441 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3442 Lisp_Object position, limit, prop, ww; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3443 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3444 /* 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
|
3445 and have already displayed the appropriate strings |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3446 on an earlier line. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3447 if (pos < ZV || !zv_strings_seen++) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3448 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3449 int ovlen; |
16245
d960549d163c
(display_text_line): Declare ovstr as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents:
16197
diff
changeset
|
3450 unsigned char *ovstr; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3451 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
|
3452 |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3453 if (ovlen > 0) |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3454 { |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3455 /* 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
|
3456 ovstr += ovstr_done; |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3457 ovlen -= ovstr_done; |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3458 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3459 while (ovlen > 0) |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3460 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3461 int charset, cols; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3462 GLYPH g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3463 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3464 if (multibyte) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3465 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3466 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
|
3467 ovstr += len, ovlen -= len, ovstr_done += len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3468 charset = CHAR_CHARSET (c); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3469 cols = (charset == CHARSET_COMPOSITION |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3470 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3471 : CHARSET_WIDTH (charset)); |
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 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3474 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3475 c = *ovstr++, ovlen--, ovstr_done++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3476 cols = 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3477 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3478 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
|
3479 while (cols-- > 0) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3480 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3481 if (p1 >= leftmargin && p1 < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3482 *p1 = g, g |= GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3483 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3484 } |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3485 } |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3486 /* 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
|
3487 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
|
3488 just for neatness' sake. */ |
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
3489 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
|
3490 ovstr_done = 0; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3491 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3492 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3493 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3494 /* Did we reach point? Record the cursor location. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3495 if (pos == PT && cursor_vpos < 0) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3496 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3497 cursor_vpos = vpos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3498 cursor_hpos = p1 - leftmargin; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3499 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3500 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3501 if (pos >= ZV) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3502 break; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3503 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3504 XSETFASTINT (position, pos); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3505 limit = Fnext_overlay_change (position); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3506 #ifdef USE_TEXT_PROPERTIES |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3507 /* This is just an estimate to give reasonable |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3508 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
|
3509 if (XFASTINT (limit) > pos + 50) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3510 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3511 int limitpos = pos + 50; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3512 XSETFASTINT (limit, limitpos); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3513 } |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3514 limit = Fnext_single_property_change (position, Qinvisible, |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3515 Fcurrent_buffer (), limit); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3516 #endif |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3517 next_boundary = XFASTINT (limit); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3518 /* 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
|
3519 the next property change. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3520 XSETWINDOW (ww, w); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3521 prop = Fget_char_property (position, Qinvisible, ww); |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3522 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3523 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3524 if (pos < PT && next_boundary >= PT) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3525 { |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3526 cursor_vpos = vpos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3527 cursor_hpos = p1 - leftmargin; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3528 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3529 pos = next_boundary; |
20666
7e740edb4d52
(display_text_line): Set pos_byte with pos
Karl Heuer <kwzh@gnu.org>
parents:
20628
diff
changeset
|
3530 pos_byte = CHAR_TO_BYTE (pos); |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3531 last_invis_skip = pos; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3532 last_invis_prop = prop; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3533 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3534 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3535 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3536 /* Did we reach point? Record the cursor location. */ |
6705 | 3537 if (pos == PT && cursor_vpos < 0) |
277 | 3538 { |
3539 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3540 cursor_hpos = p1 - leftmargin; |
277 | 3541 } |
3542 | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3543 /* 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
|
3544 Stop here. */ |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3545 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
|
3546 { |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3547 /* 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
|
3548 /* 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
|
3549 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
|
3550 { |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3551 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
|
3552 ? leftmargin : p1) |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3553 - p1start]; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3554 *p2x++ = pos; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3555 } |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3556 break; |
7aa9cdf40d37
(display_text_line): Fill in charstart for end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
12267
diff
changeset
|
3557 } |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
3558 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3559 /* 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
|
3560 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
|
3561 if (MARKERP (w->redisplay_end_trigger) |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3562 && 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
|
3563 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
|
3564 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
|
3565 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
|
3566 else |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3567 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
|
3568 |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3569 /* 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
|
3570 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
|
3571 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
|
3572 { |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3573 Lisp_Object args[3]; |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3574 |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3575 args[0] = Qredisplay_end_trigger_functions; |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3576 XSETWINDOW (args[1], w); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3577 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
|
3578 |
7167b8612c52
(display_text_line): Clear out redisplay_end_trigger
Karl Heuer <kwzh@gnu.org>
parents:
14036
diff
changeset
|
3579 /* 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
|
3580 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
|
3581 w->redisplay_end_trigger = Qnil; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3582 Frun_hook_with_args (3, args); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
3583 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3584 e_t_h = ZV; |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3585 /* 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
|
3586 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
|
3587 } |
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3588 |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3589 #ifdef HAVE_FACES |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3590 /* 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
|
3591 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
|
3592 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
|
3593 if (pos >= next_face_change |
91662157e604
(redisplay_internal): Use `Vterminal_frame' and other
Richard M. Stallman <rms@gnu.org>
parents:
15245
diff
changeset
|
3594 && (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
|
3595 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3596 int limit = pos + 50; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3597 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3598 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
|
3599 region_beg, region_end, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3600 &next_face_change, limit, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3601 } |
13519
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3602 #endif |
aee6ea2166bc
(display_text_line): Handle redisplay_end_trigger
Richard M. Stallman <rms@gnu.org>
parents:
13511
diff
changeset
|
3603 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3604 /* 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
|
3605 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
|
3606 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3607 pause = ZV; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3608 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3609 if (pos < next_boundary && next_boundary < pause) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3610 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
|
3611 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
|
3612 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
|
3613 |
13266
d6bba071525c
(try_window_id): Stop the compute_motion at ZV, not Z,
Richard M. Stallman <rms@gnu.org>
parents:
13196
diff
changeset
|
3614 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
|
3615 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
|
3616 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3617 /* 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
|
3618 the phone? */ |
6705 | 3619 if (pos < PT && PT < pause) |
3620 pause = PT; | |
277 | 3621 if (pos < GPT && GPT < pause) |
3622 pause = GPT; | |
3623 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3624 /* LIMIT_BYTE is not the same place in the buffer as PAUSE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3625 It is a limit on valid characters. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3626 We use it to bound STRING_CHAR_AND_LENGTH. */ |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3627 limit_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3628 if (pos < GPT && GPT_BYTE < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3629 limit_byte = GPT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3630 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3631 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3632 int temp = CHAR_TO_BYTE (pos); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3633 p = BYTE_POS_ADDR (temp); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3634 } |
277 | 3635 } |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3636 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3637 if (p1 >= endp) |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3638 break; |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3639 |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3640 p1prev = p1; |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3641 p1_wide_column_end = (GLYPH *) 0; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3642 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3643 if (multibyte) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3644 c = STRING_CHAR_AND_LENGTH (p, limit_byte - pos_byte, len), p += len; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3645 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3646 c = *p++, len = 1; |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3647 /* 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
|
3648 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
|
3649 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3650 p1 = copy_part_of_rope (f, p1, leftmargin, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3651 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3652 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
|
3653 current_face, rev_dir_bit); |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3654 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3655 else if (c >= 040 && c < 0177) |
277 | 3656 { |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3657 if (p1 >= leftmargin) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3658 *p1 = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
277 | 3659 p1++; |
3660 } | |
3661 else if (c == '\n') | |
3662 { | |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3663 #if 0 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3664 /* 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
|
3665 (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
|
3666 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
|
3667 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3668 |
277 | 3669 invis = 0; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3670 if (last_invis_skip == pos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3671 && 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
|
3672 invis = 1; |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3673 while (pos + 1 < ZV |
277 | 3674 && selective > 0 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3675 && indented_beyond_p (pos + 1, pos_byte + 1, selective)) |
277 | 3676 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3677 int opoint = PT, opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3678 |
277 | 3679 invis = 1; |
20896
ec8cd27243b6
(display_text_line): Use INC_BOTH for unibyte buffers too.
Richard M. Stallman <rms@gnu.org>
parents:
20786
diff
changeset
|
3680 INC_BOTH (pos, pos_byte); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3681 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1); |
21478
54680b998295
(display_text_line): When handling selective > 0,
Karl Heuer <kwzh@gnu.org>
parents:
21443
diff
changeset
|
3682 pos = PT, pos_byte = PT_BYTE; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3683 if (FETCH_BYTE (pos_byte - 1) == '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3684 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3685 pos--; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3686 pos_byte--; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3687 } |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3688 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
277 | 3689 } |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3690 if (invis && selective_rlen > 0 && p1 >= leftmargin) |
277 | 3691 { |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3692 #if 0 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3693 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
|
3694 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3695 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
|
3696 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3697 |
277 | 3698 p1 += selective_rlen; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3699 if (p1 - leftmargin > width) |
277 | 3700 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
|
3701 |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3702 #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
|
3703 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
|
3704 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
|
3705 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
|
3706 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
|
3707 *cs++ = -2; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3708 /* 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
|
3709 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
|
3710 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
|
3711 #endif |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3712 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3713 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
|
3714 (p1 - p1prev), current_face, rev_dir_bit); |
277 | 3715 } |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3716 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3717 /* 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
|
3718 /* 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
|
3719 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
|
3720 if (p1 >= leftmargin && p1prev != endp) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3721 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3722 /* 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
|
3723 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
|
3724 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
|
3725 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3726 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3727 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3728 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
|
3729 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3730 *p2x++ = pos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3731 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3732 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3733 } |
17846
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3734 #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
|
3735 /* 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
|
3736 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
|
3737 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
|
3738 { |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3739 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
|
3740 p1 = leftmargin; |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3741 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
|
3742 *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
|
3743 } |
c427501449a1
(display_text_line): Move the code to fill out the line
Richard M. Stallman <rms@gnu.org>
parents:
17698
diff
changeset
|
3744 #endif |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3745 |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3746 break; |
277 | 3747 } |
3748 else if (c == '\t') | |
3749 { | |
3750 do | |
3751 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3752 if (p1 >= leftmargin && p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3753 *p1 = MAKE_GLYPH (f, ' ', current_face) | rev_dir_bit; |
277 | 3754 p1++; |
3755 } | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3756 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0)) |
277 | 3757 % tab_width); |
3758 } | |
368 | 3759 else if (c == Ctl ('M') && selective == -1) |
277 | 3760 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3761 int opoint = PT, opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3762 scan_newline (pos, pos_byte, ZV, ZV_BYTE, 1, 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3763 pos = PT, pos_byte = PT_BYTE; |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3764 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3765 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3766 if (FETCH_BYTE (pos_byte - 1) == '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3767 pos--, pos_byte--; |
277 | 3768 if (selective_rlen > 0) |
3769 { | |
3770 p1 += selective_rlen; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3771 if (p1 - leftmargin > width) |
277 | 3772 p1 = endp; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3773 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
|
3774 (p1 - p1prev), current_face, rev_dir_bit); |
277 | 3775 } |
9572 | 3776 #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
|
3777 /* 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
|
3778 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
|
3779 if (current_face) |
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3780 { |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3781 if (p1 < leftmargin) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3782 p1 = leftmargin; |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
3783 while (p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3784 *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
|
3785 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
3786 #endif |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3787 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3788 /* 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
|
3789 /* 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
|
3790 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
|
3791 if (p1 >= leftmargin && p1prev != endp) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3792 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3793 /* 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
|
3794 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
|
3795 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
|
3796 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3797 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3798 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3799 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
|
3800 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3801 *p2x++ = pos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3802 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3803 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3804 } |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
3805 break; |
277 | 3806 } |
3807 else if (c < 0200 && ctl_arrow) | |
3808 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3809 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
|
3810 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
3811 (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
|
3812 && 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
|
3813 ? 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
|
3814 current_face) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3815 | rev_dir_bit); |
277 | 3816 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
3817 if (p1 >= leftmargin && p1 < endp) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3818 *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
|
3819 p1++; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3820 } |
277 | 3821 else |
3822 { | |
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3823 /* C is a multibyte character or a character to be displayed |
22529 | 3824 by octal form. */ |
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3825 int remaining_bytes = len; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3826 |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
3827 if (c >= 0400 && CHAR_VALID_P (c, 0)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3828 { |
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3829 /* C is a multibyte character. */ |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3830 int charset = CHAR_CHARSET (c); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3831 int columns = (charset == CHARSET_COMPOSITION |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3832 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3833 : CHARSET_WIDTH (charset)); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3834 GLYPH g = MAKE_GLYPH (f, c, current_face) | rev_dir_bit; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3835 |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3836 while (columns--) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3837 { |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3838 if (p1 >= leftmargin && p1 < endp) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3839 *p1 = g, g |= GLYPH_MASK_PADDING; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3840 p1++; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3841 } |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3842 p1_wide_column_end = p1; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3843 remaining_bytes -= CHARSET_BYTES (charset); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3844 } |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3845 |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3846 while (remaining_bytes > 0) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3847 { |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3848 c = *(p - remaining_bytes--); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3849 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3850 if (p1 >= leftmargin && p1 < endp) |
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3851 *p1 = (fix_glyph |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3852 (f, |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3853 (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3854 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3855 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3856 current_face) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3857 | rev_dir_bit); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3858 p1++; |
21443
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3859 if (p1 >= leftmargin && p1 < endp) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3860 *p1 = (MAKE_GLYPH (f, (c >> 6) + '0', current_face) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3861 | rev_dir_bit); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3862 p1++; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3863 if (p1 >= leftmargin && p1 < endp) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3864 *p1 = (MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3865 | rev_dir_bit); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3866 p1++; |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3867 if (p1 >= leftmargin && p1 < endp) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3868 *p1 = (MAKE_GLYPH (f, (7 & c) + '0', current_face) |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3869 | rev_dir_bit); |
3cb2644c8dd2
(display_text_line): Code for displaying a character by
Kenichi Handa <handa@m17n.org>
parents:
21424
diff
changeset
|
3870 p1++; |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3871 } |
277 | 3872 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
3873 |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
3874 prevpos = pos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3875 prevpos_byte = pos_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3876 pos++; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3877 pos_byte += len; |
11874
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3878 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3879 /* 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
|
3880 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3881 /* 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
|
3882 if (p1 >= leftmargin) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3883 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3884 /* 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
|
3885 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
|
3886 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
|
3887 if (p1 != p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3888 { |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3889 int *p2x = &charstart[(p1prev < leftmargin |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3890 ? leftmargin : p1prev) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3891 - p1start]; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3892 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
|
3893 |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3894 if (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3895 *p2x++ = prevpos; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3896 while (p2x < p2) |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3897 *p2x++ = -1; |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3898 } |
b8de94b7c91f
(display_text_line): Enter a char in charstarts
Karl Heuer <kwzh@gnu.org>
parents:
11854
diff
changeset
|
3899 } |
277 | 3900 } |
3901 | |
3902 val.hpos = - XINT (w->hscroll); | |
3903 if (val.hpos) | |
3904 val.hpos++; | |
3905 | |
3906 val.vpos = 1; | |
3907 | |
3908 lastpos = pos; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3909 lastpos_byte = pos_byte; |
277 | 3910 |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3911 /* 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
|
3912 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
|
3913 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
|
3914 /* 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
|
3915 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
|
3916 internal width. */ |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3917 i = p1 - p1start + 1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3918 if (p1 < leftmargin) |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3919 i += leftmargin - p1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
3920 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
|
3921 charstart[i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3922 |
277 | 3923 /* Handle continuation in middle of a character */ |
3924 /* by backing up over it */ | |
3925 if (p1 > endp) | |
3926 { | |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3927 /* 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
|
3928 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
|
3929 if (p1prev) |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3930 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3931 /* 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
|
3932 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
|
3933 LEN. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3934 pos = prevpos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3935 pos_byte = prevpos_byte; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3936 |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3937 if (p1_wide_column_end < endp) |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3938 /* As ENDP is not in the middle of wide-column character, |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3939 we can break the line at ENDP and start from the middle |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3940 column in the next line. So, adjust VAL.HPOS to skip |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3941 the columns output on this line. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3942 val.hpos += p1prev - endp; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3943 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3944 { |
20926
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3945 /* We displayed a wide-column character at around ENDP. |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3946 Since we can't broke it in the middle, the whole |
b304072b893c
(try_window_id): Use DEC_POS only for multibyte buffer.
Kenichi Handa <handa@m17n.org>
parents:
20896
diff
changeset
|
3947 character should be driven into the next line. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3948 /* 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
|
3949 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
|
3950 must be adjusted. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3951 taboffset = taboffset + (p1prev - endp); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3952 /* 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
|
3953 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3954 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
|
3955 while (p1prev < endp) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3956 *p1prev++ = g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3957 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3958 /* 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
|
3959 lastpos = pos; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3960 lastpos_byte = pos_byte; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3961 if (PT == pos) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3962 cursor_vpos = -1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3963 } |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3964 } |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
3965 |
277 | 3966 /* Keep in this line everything up to the continuation column. */ |
3967 p1 = endp; | |
3968 } | |
3969 | |
3970 /* Finish deciding which character to start the next line on, | |
3971 and what hpos to start it at. | |
3972 Also set `lastpos' to the last position which counts as "on this line" | |
3973 for cursor-positioning. */ | |
3974 | |
3975 if (pos < ZV) | |
3976 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3977 if (FETCH_BYTE (pos_byte) == '\n') |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3978 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3979 int opoint = PT, opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3980 |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3981 /* If stopped due to a newline, start next line after it */ |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3982 TEMP_SET_PT_BOTH (pos + 1, pos_byte + 1); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3983 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
3984 val.tab_offset = 0; |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3985 /* 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
|
3986 at the right margin. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3987 while (PT < ZV && selective > 0 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3988 && indented_beyond_p (PT, PT_BYTE, selective)) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3989 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3990 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3991 pos = PT, pos_byte = PT_BYTE; |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
3992 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
3993 } |
277 | 3994 else |
3995 /* Stopped due to right margin of window */ | |
3996 { | |
3997 if (truncate) | |
3998 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
3999 int opoint = PT, opoint_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4000 |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
4001 TEMP_SET_PT_BOTH (pos, pos_byte); |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4002 *p1++ = fix_glyph (f, truncator, 0); |
277 | 4003 /* Truncating => start next line after next newline, |
4004 and point is on this line if it is before the newline, | |
4005 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
|
4006 do |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4007 scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, 1, 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4008 while (PT < ZV && selective > 0 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4009 && indented_beyond_p (PT, PT_BYTE, selective)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4010 pos = PT, pos_byte = PT_BYTE; |
277 | 4011 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
23249
2df8a4a5e284
(redisplay_internal): Use TEMP_SET_PT_BOTH
Karl Heuer <kwzh@gnu.org>
parents:
23127
diff
changeset
|
4012 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4013 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4014 lastpos = pos - (FETCH_BYTE (pos_byte - 1) == '\n'); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4015 lastpos_byte = CHAR_TO_BYTE (lastpos); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4016 val.tab_offset = 0; |
277 | 4017 } |
4018 else | |
4019 { | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4020 *p1++ = fix_glyph (f, continuer, 0); |
277 | 4021 val.vpos = 0; |
21028
0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
20997
diff
changeset
|
4022 DEC_BOTH (lastpos, lastpos_byte); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4023 val.tab_offset = taboffset + width; |
277 | 4024 } |
4025 } | |
4026 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4027 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4028 val.tab_offset = 0; |
277 | 4029 |
4030 /* If point is at eol or in invisible text at eol, | |
769 | 4031 record its frame location now. */ |
277 | 4032 |
6705 | 4033 if (start <= PT && PT <= lastpos && cursor_vpos < 0) |
277 | 4034 { |
4035 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4036 cursor_hpos = p1 - leftmargin; |
277 | 4037 } |
4038 | |
4039 if (cursor_vpos == vpos) | |
4040 { | |
4041 if (cursor_hpos < 0) cursor_hpos = 0; | |
4042 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
|
4043 cursor_hpos += WINDOW_LEFT_MARGIN (w); |
769 | 4044 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) |
277 | 4045 { |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4046 this_line_bufpos = 0; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4047 |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4048 /* If this frame's cursor will be in its echo area, |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4049 don't record a cursor from the window text, |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4050 and turn off the optimization for cursor-motion-only case. */ |
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4051 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
|
4052 && 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
|
4053 { |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
4054 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
|
4055 FRAME_CURSOR_X (f) = cursor_hpos; |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4056 |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4057 if (w == XWINDOW (selected_window)) |
277 | 4058 { |
22399
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4059 /* Line is not continued and did not start |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4060 in middle of character */ |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4061 if ((hpos - WINDOW_LEFT_MARGIN (w) |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4062 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4063 && val.vpos) |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4064 { |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4065 this_line_bufpos = start; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4066 this_line_buffer = current_buffer; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4067 this_line_vpos = cursor_vpos; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4068 this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w); |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4069 this_line_endpos = Z - lastpos; |
08fe53c6f8e3
(redisplay_internal): If cursor's in the frame's echo area,
Richard M. Stallman <rms@gnu.org>
parents:
22209
diff
changeset
|
4070 } |
277 | 4071 } |
4072 } | |
4073 } | |
4074 } | |
4075 | |
4076 /* If hscroll and line not empty, insert truncation-at-left marker */ | |
4077 if (hscroll && lastpos != start) | |
4078 { | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4079 GLYPH g = fix_glyph (f, truncator, 0); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4080 *leftmargin = g; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4081 if (p1 <= leftmargin) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4082 p1 = leftmargin + 1; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4083 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
|
4084 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4085 p1prev = leftmargin + 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4086 while (p1prev < p1 && *p1prev & GLYPH_MASK_PADDING) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4087 *p1prev++ = g; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4088 } |
277 | 4089 } |
4090 | |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4091 if (!WINDOW_RIGHTMOST_P (w)) |
277 | 4092 { |
4093 endp++; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
4094 if (p1 < leftmargin) p1 = leftmargin; |
277 | 4095 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
|
4096 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
4097 /* 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
|
4098 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
|
4099 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
|
4100 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
|
4101 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
|
4102 { |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4103 int i; |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4104 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
|
4105 *p1++ = SPACEGLYPH; |
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4106 } |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4107 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
|
4108 *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
|
4109 ? XINT (DISP_BORDER_GLYPH (dp)) |
12921
ed1abc9d781b
(display_text_line): Write blanks under the entire
Karl Heuer <kwzh@gnu.org>
parents:
12792
diff
changeset
|
4110 : '|'); |
277 | 4111 } |
4112 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], | |
4113 p1 - desired_glyphs->glyphs[vpos]); | |
4114 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
4115 | |
4116 /* If the start of this line is the overlay arrow-position, | |
4117 then put the arrow string into the display-line. */ | |
4118 | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4119 if (MARKERP (Voverlay_arrow_position) |
277 | 4120 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
4121 && 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
|
4122 && STRINGP (Voverlay_arrow_string) |
277 | 4123 && ! overlay_arrow_seen) |
4124 { | |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4125 int i, i_byte; |
277 | 4126 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
|
4127 int arrow_end; |
277 | 4128 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4129 if (len > width) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
4130 len = width; |
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4131 |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4132 /* If the arrow string has text props, obey them when displaying. */ |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4133 for (i = 0, i_byte = 0; i < len; ) |
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
|
4134 { |
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4135 int c; |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4136 Lisp_Object face, ilisp; |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4137 int newface; |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4138 int idx = i; |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4139 |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4140 if (STRING_MULTIBYTE (Voverlay_arrow_string)) |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4141 FETCH_STRING_CHAR_ADVANCE (c, Voverlay_arrow_string, i, i_byte); |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4142 else |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4143 c = XSTRING (Voverlay_arrow_string)->data[i++]; |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4144 |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4145 XSETFASTINT (ilisp, i); |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4146 #ifdef HAVE_FACES |
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4147 if (FRAME_WINDOW_P (f)) |
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
|
4148 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
4149 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
|
4150 newface = compute_glyph_face_1 (f, face, 0); |
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4151 c = FAST_MAKE_GLYPH (c, newface); |
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
|
4152 } |
9572 | 4153 #endif /* HAVE_FACES */ |
21310
d5dab6049412
(display_text_line): Handle overlay-arrow correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21290
diff
changeset
|
4154 leftmargin[idx] = c; |
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
|
4155 } |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4156 |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
4157 /* 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
|
4158 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
|
4159 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
|
4160 desired_glyphs->used[vpos] = arrow_end; |
277 | 4161 |
4162 overlay_arrow_seen = 1; | |
4163 } | |
4164 | |
4165 val.bufpos = pos; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4166 val.bytepos = pos_byte; |
16397
9a25cfded05a
(display_text_line): New arg ovstr_done. (Callers changed).
Richard M. Stallman <rms@gnu.org>
parents:
16266
diff
changeset
|
4167 val.ovstring_chars_done = ovstr_done; |
277 | 4168 val_display_text_line = val; |
4169 return &val_display_text_line; | |
4170 } | |
4171 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4172 /* 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
|
4173 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4174 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4175 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4176 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4177 { |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4178 Lisp_Object items, tail; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4179 register int vpos = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4180 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
20689
10a3afa36ed2
(display_menu_bar): Don't set maxendcol too large.
Richard M. Stallman <rms@gnu.org>
parents:
20666
diff
changeset
|
4181 int maxendcol = FRAME_WIDTH (f); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4182 int hpos = 0; |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4183 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4184 |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4185 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
4186 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
4187 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4188 #endif |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4189 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4190 #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
|
4191 if (FRAME_X_P (f)) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4192 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
4193 #endif /* USE_X_TOOLKIT */ |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4194 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4195 get_display_line (f, vpos, 0); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4196 |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4197 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
|
4198 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
|
4199 { |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4200 Lisp_Object pos, string; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4201 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
|
4202 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4203 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
4204 |
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
|
4205 XSETFASTINT (XVECTOR (items)->contents[i + 3], hpos); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4206 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4207 if (hpos < maxendcol) |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4208 hpos = display_string (w, vpos, |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4209 XSTRING (string)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4210 STRING_BYTES (XSTRING (string)), |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4211 hpos, 0, 0, hpos, maxendcol, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4212 STRING_MULTIBYTE (string)); |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
4213 /* 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
|
4214 if (hpos < maxendcol) |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4215 { |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
4216 int hpos1 = hpos + 1; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
4217 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
|
4218 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
|
4219 } |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4220 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4221 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4222 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4223 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
|
4224 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
4225 /* 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
|
4226 if (maxendcol > hpos) |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4227 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
|
4228 |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4229 /* 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
|
4230 vpos++; |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
4231 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
|
4232 get_display_line (f, vpos++, 0); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4233 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
4234 |
277 | 4235 /* Display the mode line for window w */ |
4236 | |
4237 static void | |
4238 display_mode_line (w) | |
4239 struct window *w; | |
4240 { | |
4241 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
|
4242 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
|
4243 register int right = WINDOW_RIGHT_MARGIN (w); |
769 | 4244 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 4245 |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4246 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
|
4247 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4248 |
769 | 4249 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
|
4250 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4251 /* 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
|
4252 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
|
4253 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
|
4254 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
|
4255 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4256 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
|
4257 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
|
4258 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4259 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
4260 |
769 | 4261 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
277 | 4262 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4263 /* 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
|
4264 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
|
4265 partial-width windows and avoid inverting the scroll bar columns. */ |
9572 | 4266 #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
|
4267 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
|
4268 { |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4269 /* 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
|
4270 int i; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4271 unsigned int padding; |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4272 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
|
4273 for (i = left; i < right; ++i) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4274 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4275 padding = ptr[i] & GLYPH_MASK_PADDING; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4276 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
|
4277 } |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
4278 } |
17107
864b6036361c
(try_window_id): Display blank lines from the next
Kenichi Handa <handa@m17n.org>
parents:
17017
diff
changeset
|
4279 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
|
4280 #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
|
4281 |
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
4282 /* 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
|
4283 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
|
4284 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
|
4285 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
|
4286 (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
|
4287 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
|
4288 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
|
4289 || 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
|
4290 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; |
277 | 4291 } |
4292 | |
4293 /* Contribute ELT to the mode line for window W. | |
4294 How it translates into text depends on its data type. | |
4295 | |
4296 VPOS is the position of the mode line being displayed. | |
4297 | |
769 | 4298 HPOS is the position (absolute on frame) where this element's text |
277 | 4299 should start. The output is truncated automatically at the right |
4300 edge of window W. | |
4301 | |
4302 DEPTH is the depth in recursion. It is used to prevent | |
4303 infinite recursion here. | |
4304 | |
4305 MINENDCOL is the hpos before which the element may not end. | |
4306 The element is padded at the right with spaces if nec | |
4307 to reach this column. | |
4308 | |
4309 MAXENDCOL is the hpos past which this element may not extend. | |
4310 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority. | |
4311 (This is necessary to make nested padding and truncation work.) | |
4312 | |
4313 Returns the hpos of the end of the text generated by ELT. | |
4314 The next element will receive that value as its HPOS arg, | |
4315 so as to concatenate the elements. */ | |
4316 | |
4317 static int | |
4318 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) | |
4319 struct window *w; | |
4320 register int vpos, hpos; | |
4321 int depth; | |
4322 int minendcol; | |
4323 register int maxendcol; | |
4324 register Lisp_Object elt; | |
4325 { | |
4326 tail_recurse: | |
4327 if (depth > 10) | |
4328 goto invalid; | |
4329 | |
4330 depth++; | |
4331 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
4332 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 4333 { |
4334 case Lisp_String: | |
4335 { | |
4336 /* A string: output it and check for %-constructs within it. */ | |
4337 register unsigned char c; | |
4338 register unsigned char *this = XSTRING (elt)->data; | |
4339 | |
4340 while (hpos < maxendcol && *this) | |
4341 { | |
4342 unsigned char *last = this; | |
4343 while ((c = *this++) != '\0' && c != '%') | |
4344 ; | |
4345 if (this - 1 != last) | |
4346 { | |
4347 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
|
4348 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4349 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
|
4350 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4351 hpos = display_string (w, vpos, last, -1, hpos, 0, 1, |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4352 hpos, min (lim, maxendcol), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4353 STRING_MULTIBYTE (elt)); |
277 | 4354 } |
4355 else /* c == '%' */ | |
4356 { | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4357 register int minendcol; |
277 | 4358 register int spec_width = 0; |
4359 | |
4360 /* We can't allow -ve args due to the "%-" construct */ | |
4361 /* Argument specifies minwidth but not maxwidth | |
4362 (maxwidth can be specified by | |
4363 (<negative-number> . <stuff>) mode-line elements) */ | |
4364 | |
4365 while ((c = *this++) >= '0' && c <= '9') | |
4366 { | |
4367 spec_width = spec_width * 10 + (c - '0'); | |
4368 } | |
4369 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4370 minendcol = hpos + spec_width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4371 if (minendcol > maxendcol) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4372 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4373 spec_width = maxendcol - hpos; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4374 minendcol = maxendcol; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4375 } |
277 | 4376 |
4377 if (c == 'M') | |
4378 hpos = display_mode_element (w, vpos, hpos, depth, | |
4379 spec_width, maxendcol, | |
4380 Vglobal_mode_string); | |
4381 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
|
4382 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4383 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
|
4384 maxendcol - hpos); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4385 if (frame_title_ptr) |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4386 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
|
4387 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4388 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
|
4389 hpos, 0, 1, |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4390 minendcol, maxendcol, -1); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4391 } |
277 | 4392 } |
4393 } | |
4394 } | |
4395 break; | |
4396 | |
4397 case Lisp_Symbol: | |
4398 /* A symbol: process the value of the symbol recursively | |
4399 as if it appeared here directly. Avoid error if symbol void. | |
4400 Special case: if value of symbol is a string, output the string | |
4401 literally. */ | |
4402 { | |
4403 register Lisp_Object tem; | |
4404 tem = Fboundp (elt); | |
485 | 4405 if (!NILP (tem)) |
277 | 4406 { |
4407 tem = Fsymbol_value (elt); | |
4408 /* If value is a string, output that string literally: | |
4409 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
|
4410 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4411 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4412 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4413 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
|
4414 minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4415 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4416 hpos = display_string (w, vpos, XSTRING (tem)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4417 STRING_BYTES (XSTRING (tem)), |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4418 hpos, 0, 1, minendcol, maxendcol, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4419 STRING_MULTIBYTE (tem)); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4420 } |
277 | 4421 /* Give up right away for nil or t. */ |
4422 else if (!EQ (tem, elt)) | |
4423 { elt = tem; goto tail_recurse; } | |
4424 } | |
4425 } | |
4426 break; | |
4427 | |
4428 case Lisp_Cons: | |
4429 { | |
4430 register Lisp_Object car, tem; | |
4431 | |
4432 /* A cons cell: three distinct cases. | |
4433 If first element is a string or a cons, process all the elements | |
4434 and effectively concatenate them. | |
4435 If first element is a negative number, truncate displaying cdr to | |
4436 at most that many characters. If positive, pad (with spaces) | |
4437 to at least that many characters. | |
4438 If first element is a symbol, process the cadr or caddr recursively | |
4439 according to whether the symbol's value is non-nil or nil. */ | |
4440 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
|
4441 if (SYMBOLP (car)) |
277 | 4442 { |
4443 tem = Fboundp (car); | |
4444 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
|
4445 if (!CONSP (elt)) |
277 | 4446 goto invalid; |
4447 /* elt is now the cdr, and we know it is a cons cell. | |
4448 Use its car if CAR has a non-nil value. */ | |
485 | 4449 if (!NILP (tem)) |
277 | 4450 { |
4451 tem = Fsymbol_value (car); | |
485 | 4452 if (!NILP (tem)) |
277 | 4453 { elt = XCONS (elt)->car; goto tail_recurse; } |
4454 } | |
4455 /* Symbol's value is nil (or symbol is unbound) | |
4456 Get the cddr of the original list | |
4457 and if possible find the caddr and use that. */ | |
4458 elt = XCONS (elt)->cdr; | |
485 | 4459 if (NILP (elt)) |
277 | 4460 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4461 else if (!CONSP (elt)) |
277 | 4462 goto invalid; |
4463 elt = XCONS (elt)->car; | |
4464 goto tail_recurse; | |
4465 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4466 else if (INTEGERP (car)) |
277 | 4467 { |
4468 register int lim = XINT (car); | |
4469 elt = XCONS (elt)->cdr; | |
4470 if (lim < 0) | |
4471 /* Negative int means reduce maximum width. | |
4472 DO NOT change MINENDCOL here! | |
4473 (20 -10 . foo) should truncate foo to 10 col | |
4474 and then pad to 20. */ | |
4475 maxendcol = min (maxendcol, hpos - lim); | |
4476 else if (lim > 0) | |
4477 { | |
4478 /* Padding specified. Don't let it be more than | |
4479 current maximum. */ | |
4480 lim += hpos; | |
4481 if (lim > maxendcol) | |
4482 lim = maxendcol; | |
4483 /* If that's more padding than already wanted, queue it. | |
4484 But don't reduce padding already specified even if | |
4485 that is beyond the current truncation point. */ | |
4486 if (lim > minendcol) | |
4487 minendcol = lim; | |
4488 } | |
4489 goto tail_recurse; | |
4490 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
4491 else if (STRINGP (car) || CONSP (car)) |
277 | 4492 { |
4493 register int limit = 50; | |
4494 /* 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
|
4495 while (CONSP (elt) && --limit > 0 |
277 | 4496 && hpos < maxendcol) |
4497 { | |
4498 hpos = display_mode_element (w, vpos, hpos, depth, | |
4499 hpos, maxendcol, | |
4500 XCONS (elt)->car); | |
4501 elt = XCONS (elt)->cdr; | |
4502 } | |
4503 } | |
4504 } | |
4505 break; | |
4506 | |
4507 default: | |
4508 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4509 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4510 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
|
4511 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4512 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
|
4513 minendcol, maxendcol, 0); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4514 return hpos; |
277 | 4515 } |
4516 | |
4517 if (minendcol > hpos) | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4518 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4519 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
|
4520 else |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4521 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
|
4522 0, 1, minendcol, maxendcol, 0); |
277 | 4523 return hpos; |
4524 } | |
4525 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4526 /* 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
|
4527 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
|
4528 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4529 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4530 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4531 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4532 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4533 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4534 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4535 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4536 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4537 if (d <= 0) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4538 *p++ = '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4539 else |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4540 while (d > 0) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4541 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4542 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4543 d /= 10; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4544 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4545 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
|
4546 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4547 while (p > buf) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4548 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4549 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4550 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4551 *p-- = d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4552 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4553 } |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4554 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4555 /* 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
|
4556 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
|
4557 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
|
4558 |
24199
204d0a24ddf5
(decode_mode_spec_coding): Display the EOL type as a string.
Eli Zaretskii <eliz@gnu.org>
parents:
24040
diff
changeset
|
4559 static char invalid_eol_type[] = "(*invalid*)"; |
204d0a24ddf5
(decode_mode_spec_coding): Display the EOL type as a string.
Eli Zaretskii <eliz@gnu.org>
parents:
24040
diff
changeset
|
4560 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4561 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4562 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
|
4563 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4564 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4565 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4566 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4567 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4568 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4569 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4570 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4571 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4572 Lisp_Object eoltype; |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4573 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4574 val = coding_system; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4575 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4576 if (NILP (val)) /* Not yet decided. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4577 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4578 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4579 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
4580 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4581 eoltype = 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
|
4582 /* 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
|
4583 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4584 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4585 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4586 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4587 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4588 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
|
4589 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4590 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
|
4591 { |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4592 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
|
4593 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
|
4594 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
|
4595 } |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4596 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4597 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4598 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
4599 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4600 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4601 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4602 /* 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
|
4603 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4604 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
|
4605 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
|
4606 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
|
4607 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
|
4608 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
|
4609 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
|
4610 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4611 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
4612 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4613 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4614 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4615 |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4616 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4617 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4618 /* Mention the EOL conversion if it is not the usual one. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4619 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4620 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4621 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4622 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4623 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4624 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4625 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4626 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4627 eol_str_len = sizeof (invalid_eol_type) - 1; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4628 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4629 strcpy (buf, eol_str); |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4630 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4631 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
4632 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4633 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4634 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4635 |
277 | 4636 /* 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
|
4637 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
|
4638 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
|
4639 function will later be truncated to width MAXWIDTH. */ |
277 | 4640 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
4641 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
|
4642 |
277 | 4643 static char * |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4644 decode_mode_spec (w, c, spec_width, maxwidth) |
277 | 4645 struct window *w; |
4646 register char c; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4647 register int spec_width; |
277 | 4648 register int maxwidth; |
4649 { | |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4650 Lisp_Object obj; |
769 | 4651 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
4652 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
|
4653 struct buffer *b = XBUFFER (w->buffer); |
277 | 4654 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
4655 obj = Qnil; |
769 | 4656 if (maxwidth > FRAME_WIDTH (f)) |
4657 maxwidth = FRAME_WIDTH (f); | |
277 | 4658 |
4659 switch (c) | |
4660 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4661 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4662 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
|
4663 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4664 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
|
4665 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4666 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4667 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4668 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4669 /* 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
|
4670 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
|
4671 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4672 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
|
4673 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4674 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4675 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4676 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4677 /* 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
|
4678 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
|
4679 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4680 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4681 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4682 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4683 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4684 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4685 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4686 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4687 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4688 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4689 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4690 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
|
4691 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4692 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
|
4693 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
|
4694 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4695 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4696 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
|
4697 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4698 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4699 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4700 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4701 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4702 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4703 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4704 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
|
4705 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4706 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
|
4707 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
|
4708 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4709 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4710 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
|
4711 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4712 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4713 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4714 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4715 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
|
4716 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
|
4717 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4718 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
|
4719 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
|
4720 else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4721 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4722 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
|
4723 *p++ = '-'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4724 *p = '\0'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4725 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4726 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
|
4727 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4728 |
277 | 4729 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4730 obj = b->name; |
277 | 4731 #if 0 |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4732 if (maxwidth >= 3 && STRING_BYTES (XSTRING (obj)) > maxwidth) |
277 | 4733 { |
4734 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1); | |
4735 decode_mode_spec_buf[maxwidth - 1] = '\\'; | |
4736 decode_mode_spec_buf[maxwidth] = '\0'; | |
4737 return decode_mode_spec_buf; | |
4738 } | |
4739 #endif | |
4740 break; | |
4741 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4742 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4743 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4744 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
|
4745 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
|
4746 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
|
4747 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
|
4748 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4749 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4750 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4751 /* %F displays the frame name. */ |
20039
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4752 /* Systems that can only display a single frame at a time should |
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4753 NOT replace the frame name with the (constant) frame title, |
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4754 since then they won't be able to tell which frame is that. */ |
83d32ee54f68
(decode_mode_spec): Display non-nil title as the frame's
Eli Zaretskii <eliz@gnu.org>
parents:
19915
diff
changeset
|
4755 if (FRAME_WINDOW_P (f) && !NILP (f->title)) |
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
4756 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
4757 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
|
4758 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
|
4759 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
|
4760 |
277 | 4761 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4762 obj = b->filename; |
277 | 4763 #if 0 |
485 | 4764 if (NILP (obj)) |
277 | 4765 return "[none]"; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4766 else if (STRINGP (obj) && STRING_BYTES (XSTRING (obj)) > maxwidth) |
277 | 4767 { |
4768 bcopy ("...", decode_mode_spec_buf, 3); | |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21179
diff
changeset
|
4769 bcopy (XSTRING (obj)->data + STRING_BYTES (XSTRING (obj)) - maxwidth + 3, |
277 | 4770 decode_mode_spec_buf + 3, maxwidth - 3); |
4771 return decode_mode_spec_buf; | |
4772 } | |
4773 #endif | |
4774 break; | |
4775 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4776 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4777 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4778 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4779 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4780 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4781 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4782 Lisp_Object tem; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4783 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4784 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4785 /* 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
|
4786 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4787 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
|
4788 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
4789 /* 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
|
4790 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
|
4791 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4792 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4793 /* 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
|
4794 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
|
4795 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4796 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4797 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4798 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4799 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4800 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4801 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4802 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4803 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4804 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4805 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4806 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4807 linepos_byte = buf_charpos_to_bytepos (b, linepos); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4808 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4809 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4810 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4811 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4812 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4813 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4814 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4815 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4816 /* Count lines from base line to window start position. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4817 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4818 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4819 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4820 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4821 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4822 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4823 /* 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
|
4824 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
|
4825 "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
|
4826 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
|
4827 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4828 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4829 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
|
4830 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
|
4831 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4832 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
|
4833 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4834 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4835 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4836 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4837 int position; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4838 int distance = (height * 2 + 30) * 200; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4839 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4840 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4841 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4842 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4843 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4844 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4845 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4846 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4847 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4848 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4849 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4850 /* 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
|
4851 200 chars per line, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4852 give up on line numbers for this window. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4853 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4854 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4855 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4856 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4857 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4858 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4859 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4860 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4861 XSETFASTINT (w->base_line_pos, BYTE_TO_CHAR (position)); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4862 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4863 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4864 /* Now count lines from the start pos to point. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4865 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4866 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4867 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4868 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4869 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4870 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4871 /* Make the string to show. */ |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4872 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
|
4873 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4874 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4875 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4876 char* p = decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4877 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
|
4878 strcpy (p, "??"); |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4879 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
4880 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4881 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4882 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
4883 |
277 | 4884 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4885 obj = b->mode_name; |
277 | 4886 break; |
4887 | |
4888 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4889 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 4890 return " Narrow"; |
4891 break; | |
4892 | |
4893 case 'p': | |
4894 { | |
4895 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
|
4896 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
|
4897 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4898 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 4899 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4900 if (pos <= BUF_BEGV (b)) |
277 | 4901 return "All"; |
4902 else | |
4903 return "Bottom"; | |
4904 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4905 else if (pos <= BUF_BEGV (b)) |
277 | 4906 return "Top"; |
4907 else | |
4908 { | |
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
|
4909 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
|
4910 /* 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
|
4911 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
|
4912 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
|
4913 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 4914 /* We can't normally display a 3-digit number, |
4915 so get us a 2-digit number that is close. */ | |
4916 if (total == 100) | |
4917 total = 99; | |
4918 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
4919 return decode_mode_spec_buf; | |
4920 } | |
4921 } | |
4922 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4923 /* 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
|
4924 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4925 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4926 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
|
4927 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
|
4928 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
|
4929 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4930 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4931 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4932 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4933 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4934 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4935 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4936 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4937 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4938 { |
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
|
4939 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
|
4940 /* 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
|
4941 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
|
4942 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
|
4943 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
|
4944 /* 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
|
4945 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
|
4946 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4947 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4948 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4949 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4950 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4951 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4952 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4953 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4954 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
4955 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4956 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4957 /* 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
|
4958 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
|
4959 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
|
4960 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
|
4961 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4962 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
|
4963 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4964 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4965 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4966 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
|
4967 #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
|
4968 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
|
4969 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4970 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
4971 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4972 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4973 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4974 /* 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
|
4975 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4976 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4977 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4978 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
|
4979 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4980 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
4981 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4982 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4983 /* 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
|
4984 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4985 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
|
4986 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
|
4987 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
4988 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
|
4989 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
4990 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
4991 #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
|
4992 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4993 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4994 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4995 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4996 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
|
4997 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
4998 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
|
4999 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5000 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5001 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
5002 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5003 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5004 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5005 } |
277 | 5006 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5007 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
5008 if (STRINGP (obj)) |
277 | 5009 return (char *) XSTRING (obj)->data; |
5010 else | |
5011 return ""; | |
5012 } | |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5013 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5014 /* Count up to COUNT lines starting from START / START_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5015 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5016 Return the number of lines thus found (always nonnegative). |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5017 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5018 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */ |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5019 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5020 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5021 display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5022 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5023 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5024 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5025 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5026 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5027 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5028 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5029 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5030 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5031 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5032 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5033 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5034 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5035 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5036 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5037 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5038 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5039 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5040 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5041 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5042 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5043 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5044 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5045 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5046 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5047 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5048 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5049 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5050 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5051 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5052 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5053 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5054 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5055 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5056 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5057 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5058 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5059 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5060 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5061 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5062 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5063 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5064 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5065 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5066 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5067 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5068 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5069 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5070 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5071 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5072 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5073 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5074 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5075 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5076 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5077 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5078 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5079 base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5080 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5081 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5082 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5083 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5084 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5085 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5086 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5087 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5088 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5089 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5090 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5091 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5092 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5093 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5094 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5095 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5096 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5097 not count the newline posterior to which we stop. */ |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5098 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5099 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5100 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5101 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5102 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5103 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5104 /* Here we add 1 to compensate for the last decrement |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5105 of CURSOR, which took it past the valid range. */ |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5106 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5107 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5108 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5109 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5110 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5111 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5112 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5113 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5114 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5115 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
5116 } |
277 | 5117 |
5118 /* Display STRING on one line of window W, starting at HPOS. | |
5119 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
|
5120 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
|
5121 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated. |
277 | 5122 |
5123 TRUNCATE is GLYPH to display at end if truncated. Zero for none. | |
5124 | |
5125 MINCOL is the first column ok to end at. (Pad with spaces to this col.) | |
5126 MAXCOL is the last column ok to end at. Truncate here. | |
5127 -1 for MINCOL or MAXCOL means no explicit minimum or maximum. | |
769 | 5128 Both count from the left edge of the frame, as does HPOS. |
277 | 5129 The right edge of W is an implicit maximum. |
5130 If TRUNCATE is nonzero, the implicit maximum is one column before the edge. | |
5131 | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5132 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
|
5133 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
|
5134 and not display anything beyond there. Otherwise, only MAXCOL |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5135 controls where to stop output. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5136 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5137 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
|
5138 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
|
5139 value of enable_multibyte_characters. |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5140 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5141 Returns ending hpos. */ |
277 | 5142 |
5143 static int | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5144 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
|
5145 obey_window_width, mincol, maxcol, multibyte) |
277 | 5146 struct window *w; |
5147 unsigned char *string; | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5148 int length; |
277 | 5149 int vpos, hpos; |
5150 GLYPH truncate; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5151 int obey_window_width; |
277 | 5152 int mincol, maxcol; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5153 int multibyte; |
277 | 5154 { |
5155 register int c; | |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5156 int truncated; |
277 | 5157 register GLYPH *p1; |
5158 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
|
5159 int tab_width = XINT (XBUFFER (w->buffer)->tab_width); |
277 | 5160 register GLYPH *start; |
5161 register GLYPH *end; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5162 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
|
5163 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 5164 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos; |
5165 int window_width = XFASTINT (w->width); | |
5166 | |
5167 /* Use the standard display table, not the window's display table. | |
5168 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
|
5169 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
|
5170 int i; |
277 | 5171 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5172 if (multibyte == -1) |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
5173 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
|
5174 /* 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
|
5175 |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
5176 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
|
5177 dp = XCHAR_TABLE (Vstandard_display_table); |
277 | 5178 |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
5179 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 5180 |
5181 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
|
5182 start = desired_glyphs->glyphs[vpos]; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5183 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5184 if (obey_window_width) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5185 { |
18852
ab7fae992236
(display_string): Ignore W->left if OBEY_WINDOW_WIDTH is zero.
Richard M. Stallman <rms@gnu.org>
parents:
18834
diff
changeset
|
5186 start += XFASTINT (w->left); |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5187 end = start + window_width - (truncate != 0); |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5188 |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5189 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
|
5190 { |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5191 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
|
5192 { |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5193 int i; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5194 |
8943
a9e40d478857
(display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
5195 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
|
5196 *end-- = ' '; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5197 } |
16255
dcde843403a3
(display_mode_line): Use faces for inverse video mode line whenever possible.
Richard M. Stallman <rms@gnu.org>
parents:
16245
diff
changeset
|
5198 else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5199 *end-- = '|'; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5200 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
5201 } |
277 | 5202 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5203 if (! obey_window_width |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5204 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol)) |
277 | 5205 end = desired_glyphs->glyphs[vpos] + maxcol; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5206 |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5207 /* 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
|
5208 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
|
5209 desired_glyphs->charstarts[vpos][i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
5210 |
277 | 5211 if (maxcol >= 0 && mincol > maxcol) |
5212 mincol = maxcol; | |
5213 | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5214 if (length < 0) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5215 /* We need this value for multibyte characters. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5216 length = strlen (string); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5217 |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5218 /* 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
|
5219 (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
|
5220 truncated = 0; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5221 while (1) |
277 | 5222 { |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5223 int len; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5224 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5225 if (length <= 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5226 break; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5227 if (multibyte) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5228 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
|
5229 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5230 c = *string, len = 1; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5231 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5232 string += len, length -= len; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5233 |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5234 if (p1 >= end) |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5235 { |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5236 truncated = 1; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5237 break; |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5238 } |
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5239 |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5240 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
|
5241 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5242 p1 = copy_part_of_rope (f, p1, start, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5243 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5244 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5245 0); |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5246 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
5247 else if (c >= 040 && c < 0177) |
277 | 5248 { |
5249 if (p1 >= start) | |
5250 *p1 = c; | |
5251 p1++; | |
5252 } | |
5253 else if (c == '\t') | |
5254 { | |
5255 do | |
5256 { | |
5257 if (p1 >= start && p1 < end) | |
5258 *p1 = SPACEGLYPH; | |
5259 p1++; | |
5260 } | |
5261 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width); | |
5262 } | |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
5263 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow)) |
277 | 5264 { |
5265 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
|
5266 *p1 = (fix_glyph |
9468df9944cc
(copy_part_of_rope): Declare glyph as type GLYPH. For a
Kenichi Handa <handa@m17n.org>
parents:
17107
diff
changeset
|
5267 (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
|
5268 && 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
|
5269 ? 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
|
5270 0)); |
277 | 5271 p1++; |
368 | 5272 if (p1 >= start && p1 < end) |
277 | 5273 *p1 = c ^ 0100; |
5274 p1++; | |
5275 } | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5276 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5277 { |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5278 /* C is a multibyte character, control character or a binary |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5279 byte data. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5280 int remaining_bytes = len; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5281 |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5282 if (c >= 0400 && CHAR_VALID_P (c, 0)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5283 { |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5284 /* C is a multibyte character. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5285 int charset = CHAR_CHARSET (c); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5286 int columns = (charset == CHARSET_COMPOSITION |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5287 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->width |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5288 : CHARSET_WIDTH (charset)); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5289 |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5290 remaining_bytes -= CHARSET_BYTES (charset); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5291 if (p1 < start) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5292 { |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5293 /* Since we can't show the left part of C, fill all |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5294 columns with spaces. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5295 columns -= start - p1; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5296 p1 = start; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5297 while (columns--) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5298 { |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5299 if (p1 < end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5300 *p1 = SPACEGLYPH; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5301 p1++; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5302 } |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5303 } |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5304 else if (p1 + columns > end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5305 { |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5306 /* Since we can't show the right part of C, fill all |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5307 columns with TRUNCATE if TRUNCATE is specified. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5308 if (truncate) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5309 { |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5310 while (p1 < end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5311 *p1++ = fix_glyph (f, truncate, 0); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5312 /* And tell the line is truncated. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5313 truncated = 1; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5314 } |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5315 break; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5316 } |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5317 else |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5318 { |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5319 /* We can show the whole glyph of C. */ |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5320 *p1++ = c; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5321 while (--columns) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5322 *p1++ = c | GLYPH_MASK_PADDING; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5323 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5324 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5325 |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5326 while (remaining_bytes > 0) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5327 { |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5328 c = *(string - remaining_bytes--); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5329 |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5330 if (p1 >= start) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5331 *p1 = (fix_glyph |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5332 (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5333 && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5334 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5335 0)); |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5336 p1++; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5337 if (p1 >= start && p1 < end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5338 *p1 = (c >> 6) + '0'; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5339 p1++; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5340 if (p1 >= start && p1 < end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5341 *p1 = (7 & (c >> 3)) + '0'; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5342 p1++; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5343 if (p1 >= start && p1 < end) |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5344 *p1 = (7 & c) + '0'; |
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
5345 p1++; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5346 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5347 } |
277 | 5348 } |
5349 | |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
5350 if (truncated) |
277 | 5351 { |
5352 p1 = end; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
5353 if (truncate) *p1++ = fix_glyph (f, truncate, 0); |
277 | 5354 } |
5355 else if (mincol >= 0) | |
5356 { | |
5357 end = desired_glyphs->glyphs[vpos] + mincol; | |
5358 while (p1 < end) | |
5359 *p1++ = SPACEGLYPH; | |
5360 } | |
5361 | |
5362 { | |
5363 register int len = p1 - desired_glyphs->glyphs[vpos]; | |
5364 | |
5365 if (len > desired_glyphs->used[vpos]) | |
5366 desired_glyphs->used[vpos] = len; | |
5367 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
5368 | |
5369 return len; | |
5370 } | |
5371 } | |
5372 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5373 /* 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
|
5374 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
|
5375 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
|
5376 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
|
5377 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
|
5378 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5379 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5380 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5381 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5382 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5383 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5384 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5385 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5386 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5387 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
|
5388 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5389 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5390 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5391 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5392 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5393 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
|
5394 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5395 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5396 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5397 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5398 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5399 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5400 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5401 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5402 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
|
5403 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5404 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5405 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5406 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5407 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5408 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
|
5409 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5410 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5411 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5412 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5413 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5414 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5415 /* 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
|
5416 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
|
5417 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
|
5418 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
|
5419 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
|
5420 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5421 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5422 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5423 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5424 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5425 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5426 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5427 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5428 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5429 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
|
5430 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5431 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5432 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5433 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
|
5434 return ! NILP (XCONS (tem)->cdr); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5435 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5436 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5437 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5438 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5439 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5440 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5441 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5442 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
|
5443 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5444 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5445 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5446 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
|
5447 return ! NILP (XCONS (tem)->cdr); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5448 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
5449 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5450 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5451 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
5452 |
277 | 5453 void |
5454 syms_of_xdisp () | |
5455 { | |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5456 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5457 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5458 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
5459 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
|
5460 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
|
5461 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
5462 staticpro (&Qoverriding_terminal_local_map); |
12267 | 5463 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
|
5464 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
5465 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
|
5466 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
|
5467 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5468 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5469 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
|
5470 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5471 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
5472 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
|
5473 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5474 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5475 Qinhibit_point_motion_hooks = intern ("inhibit-point-motion-hooks"); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
5476 |
277 | 5477 staticpro (&last_arrow_position); |
5478 staticpro (&last_arrow_string); | |
5479 last_arrow_position = Qnil; | |
5480 last_arrow_string = Qnil; | |
5481 | |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5482 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5483 "Non-nil means don't actually do any redisplay.\n\ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5484 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5485 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
5486 |
277 | 5487 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
5488 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 5489 Vglobal_mode_string = Qnil; |
5490 | |
5491 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
5492 "Marker for where to display an arrow on top of the buffer text.\n\ | |
5493 This must be the beginning of a line in order to work.\n\ | |
5494 See also `overlay-arrow-string'."); | |
5495 Voverlay_arrow_position = Qnil; | |
5496 | |
5497 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
5498 "String to display as an arrow. See also `overlay-arrow-position'."); | |
5499 Voverlay_arrow_string = Qnil; | |
5500 | |
5501 DEFVAR_INT ("scroll-step", &scroll_step, | |
5502 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 5503 If that fails to bring point back on frame, point is centered instead.\n\ |
5504 If this is zero, point is always centered after it moves off frame."); | |
277 | 5505 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5506 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5507 "*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
|
5508 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
5509 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5510 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5511 "*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
|
5512 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
|
5513 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5514 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
5515 |
277 | 5516 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
5517 | |
5518 DEFVAR_BOOL ("truncate-partial-width-windows", | |
5519 &truncate_partial_width_windows, | |
769 | 5520 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 5521 truncate_partial_width_windows = 1; |
5522 | |
5523 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
5524 "*Non-nil means use inverse video for the mode line."); | |
5525 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5526 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5527 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
20997 | 5528 "*Maximum buffer size (in characters) for line number display\n\ |
5529 If the buffer is bigger than this, the line number does not appear\n\ | |
5530 in the mode line.."); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
5531 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
|
5532 |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
5533 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
|
5534 "*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
|
5535 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
|
5536 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5537 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
|
5538 "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
|
5539 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
|
5540 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
|
5541 `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
|
5542 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5543 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
|
5544 "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
|
5545 \(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
|
5546 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
|
5547 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
|
5548 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5549 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
|
5550 "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
|
5551 \(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
|
5552 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
|
5553 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
|
5554 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5555 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5556 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5557 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5558 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5559 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5560 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5561 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5562 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5563 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5564 Qnil))); |
10393 | 5565 |
5566 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
5567 "Maximum number of lines to keep in the message log buffer.\n\ | |
5568 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
5569 the buffer when it becomes large."); | |
5570 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5571 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
5572 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
|
5573 "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
|
5574 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
|
5575 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
|
5576 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
|
5577 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
|
5578 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
|
5579 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
5580 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5581 "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
|
5582 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
|
5583 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
|
5584 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
|
5585 Vwindow_scroll_functions = Qnil; |
20259
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5586 |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5587 DEFVAR_INT ("minibuffer-scroll-overlap", &minibuffer_scroll_overlap, |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5588 "*Number of characters of overlap when scrolling a one-line window.\n\ |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5589 This commonly affects the minibuffer window, hence the name of the variable."); |
0393daff516c
(minibuffer_scroll_overlap): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
20258
diff
changeset
|
5590 minibuffer_scroll_overlap = 20; |
277 | 5591 } |
5592 | |
5593 /* initialize the window system */ | |
21514 | 5594 void |
277 | 5595 init_xdisp () |
5596 { | |
5597 Lisp_Object root_window; | |
5598 #ifndef COMPILER_REGISTER_BUG | |
5599 register | |
5600 #endif /* COMPILER_REGISTER_BUG */ | |
5601 struct window *mini_w; | |
5602 | |
5603 this_line_bufpos = 0; | |
5604 | |
5605 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
|
5606 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 5607 |
5608 echo_area_glyphs = 0; | |
5609 previous_echo_glyphs = 0; | |
5610 | |
5611 if (!noninteractive) | |
5612 { | |
769 | 5613 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
|
5614 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
|
5615 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
|
5616 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
|
5617 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5618 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 5619 set_window_height (minibuf_window, 1, 0); |
5620 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
5621 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
|
5622 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
277 | 5623 } |
5624 } |