Mercurial > emacs
annotate src/xdisp.c @ 11758:eb208ec6d216
(Helper-help): Use read-key-sequence.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 08 May 1995 21:09:17 +0000 |
parents | 9238e21a6f09 |
children | d110042c1d95 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
10393 | 2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc. |
277 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 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
|
8 the Free Software Foundation; either version 2, or (at your option) |
277 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
21 #include <config.h> |
277 | 22 #include <stdio.h> |
23 /*#include <ctype.h>*/ | |
24 #undef NULL | |
25 #include "lisp.h" | |
769 | 26 #include "frame.h" |
277 | 27 #include "window.h" |
28 #include "termchar.h" | |
29 #include "dispextern.h" | |
30 #include "buffer.h" | |
31 #include "indent.h" | |
32 #include "commands.h" | |
33 #include "macros.h" | |
34 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
35 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
36 #include "intervals.h" |
277 | 37 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
38 #ifdef USE_X_TOOLKIT |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
39 extern void set_frame_menubar (); |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
40 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
41 |
277 | 42 extern int interrupt_input; |
43 extern int command_loop_level; | |
44 | |
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
|
45 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
|
46 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
47 /* Nonzero means print newline to stdout before next minibuffer message. */ |
277 | 48 |
49 int noninteractive_need_newline; | |
50 | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
51 /* 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
|
52 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
53 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
54 |
277 | 55 #define min(a, b) ((a) < (b) ? (a) : (b)) |
56 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
57 | |
58 /* The buffer position of the first character appearing | |
769 | 59 entirely or partially on the current frame line. |
60 Or zero, which disables the optimization for the current frame line. */ | |
277 | 61 static int this_line_bufpos; |
62 | |
63 /* Number of characters past the end of this line, | |
64 including the terminating newline */ | |
65 static int this_line_endpos; | |
66 | |
769 | 67 /* The vertical position of this frame line. */ |
277 | 68 static int this_line_vpos; |
69 | |
769 | 70 /* Hpos value for start of display on this frame line. |
277 | 71 Usually zero, but negative if first character really began |
72 on previous line */ | |
73 static int this_line_start_hpos; | |
74 | |
75 /* Buffer that this_line variables are describing. */ | |
76 static struct buffer *this_line_buffer; | |
77 | |
78 /* Set by try_window_id to the vpos of first of any lines | |
769 | 79 scrolled on to the bottom of the frame. These lines should |
277 | 80 not be included in any general scroll computation. */ |
81 static int scroll_bottom_vpos; | |
82 | |
83 /* Value of echo_area_glyphs when it was last acted on. | |
769 | 84 If this is nonzero, there is a message on the frame |
277 | 85 in the minibuffer and it should be erased as soon |
86 as it is no longer requested to appear. */ | |
87 char *previous_echo_glyphs; | |
88 | |
769 | 89 /* Nonzero means truncate lines in all windows less wide than the frame */ |
277 | 90 int truncate_partial_width_windows; |
91 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
92 /* 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
|
93 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
|
94 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
95 |
277 | 96 Lisp_Object Vglobal_mode_string; |
97 | |
98 /* Marker for where to display an arrow on top of the buffer text. */ | |
99 Lisp_Object Voverlay_arrow_position; | |
100 | |
101 /* String to display for the arrow. */ | |
102 Lisp_Object Voverlay_arrow_string; | |
103 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
104 /* 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
|
105 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
|
106 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
107 /* 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
|
108 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
|
109 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
110 /* 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
|
111 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
|
112 have changed. */ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
113 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
114 |
277 | 115 /* Values of those variables at last redisplay. */ |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
116 static Lisp_Object last_arrow_position, last_arrow_string; |
277 | 117 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
118 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
|
119 |
277 | 120 /* Nonzero if overlay arrow has been displayed once in this window. */ |
121 static int overlay_arrow_seen; | |
122 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
123 /* 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
|
124 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
|
125 |
769 | 126 /* If cursor motion alone moves point off frame, |
277 | 127 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
|
128 static int scroll_step; |
277 | 129 |
130 /* Nonzero if try_window_id has made blank lines at window bottom | |
131 since the last redisplay that paused */ | |
132 static int blank_end_of_window; | |
133 | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
134 /* 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
|
135 (or another buffer with the same base buffer). |
277 | 136 keyboard.c refers to this. */ |
137 int buffer_shared; | |
138 | |
769 | 139 /* display_text_line sets these to the frame position (origin 0) of point, |
277 | 140 whether the window is selected or not. |
141 Set one to -1 first to determine whether point was found afterwards. */ | |
142 | |
143 static int cursor_vpos; | |
144 static int cursor_hpos; | |
145 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
146 static int debug_end_pos; |
277 | 147 |
148 /* Nonzero means display mode line highlighted */ | |
149 int mode_line_inverse_video; | |
150 | |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
151 static int message_log_check_duplicate (); |
277 | 152 static void echo_area_display (); |
153 void mark_window_display_accurate (); | |
154 static void redisplay_windows (); | |
155 static void redisplay_window (); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
156 static void update_menu_bars (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
157 static void update_menu_bar (); |
277 | 158 static void try_window (); |
159 static int try_window_id (); | |
160 static struct position *display_text_line (); | |
161 static void display_mode_line (); | |
162 static int display_mode_element (); | |
163 static char *fmodetrunc (); | |
164 static char *decode_mode_spec (); | |
165 static int display_string (); | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
166 static void display_menu_bar (); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
167 static int display_count_lines (); |
277 | 168 |
169 /* 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
|
170 Lisp_Object minibuf_prompt; |
277 | 171 |
172 /* Width in columns of current minibuffer prompt. */ | |
173 int minibuf_prompt_width; | |
174 | |
175 /* Message to display instead of minibuffer contents | |
176 This is what the functions error and message make, | |
177 and command echoing uses it as well. | |
178 It overrides the minibuf_prompt as well as the buffer. */ | |
179 char *echo_area_glyphs; | |
180 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
181 /* 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
|
182 int echo_area_glyphs_length; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
183 |
277 | 184 /* true iff we should redraw the mode lines on the next redisplay */ |
185 int update_mode_lines; | |
186 | |
187 /* Smallest number of characters before the gap | |
188 at any time since last redisplay that finished. | |
189 Valid for current buffer when try_window_id can be called. */ | |
190 int beg_unchanged; | |
191 | |
192 /* Smallest number of characters after the gap | |
193 at any time since last redisplay that finished. | |
194 Valid for current buffer when try_window_id can be called. */ | |
195 int end_unchanged; | |
196 | |
197 /* MODIFF as of last redisplay that finished; | |
198 if it matches MODIFF, beg_unchanged and end_unchanged | |
199 contain no useful information */ | |
200 int unchanged_modified; | |
201 | |
202 /* Nonzero if head_clip or tail_clip of current buffer has changed | |
203 since last redisplay that finished */ | |
204 int clip_changed; | |
205 | |
206 /* Nonzero if window sizes or contents have changed | |
207 since last redisplay that finished */ | |
208 int windows_or_buffers_changed; | |
209 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
210 /* 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
|
211 and it displayed a line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
212 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
213 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
214 /* 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
|
215 static int line_number_display_limit; |
10393 | 216 |
217 /* Number of lines to keep in the message log buffer. | |
218 t means infinite. nil means don't log at all. */ | |
219 Lisp_Object Vmessage_log_max; | |
277 | 220 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
221 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
222 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
223 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
224 if (message_log_need_newline) |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
225 message_dolog ("", 0, 1); |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
226 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
227 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
228 |
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
229 /* 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
|
230 This function calls low-level routines in order to bypass text property |
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
231 hooks, etc. which might not be safe to run. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
232 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
233 void |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
234 message_dolog (m, len, nlflag) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
235 char *m; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
236 int len, nlflag; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
237 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
238 if (!NILP (Vmessage_log_max)) |
10393 | 239 { |
240 struct buffer *oldbuf; | |
241 int oldpoint, oldbegv, oldzv; | |
242 | |
243 oldbuf = current_buffer; | |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
244 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
|
245 current_buffer->undo_list = Qt; |
10393 | 246 oldpoint = PT; |
247 oldbegv = BEGV; | |
248 oldzv = ZV; | |
10442
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
249 BEGV = BEG; |
d379e2c60766
(message_dolog): Ignore narrowing.
Karl Heuer <kwzh@gnu.org>
parents:
10441
diff
changeset
|
250 ZV = Z; |
10393 | 251 if (oldpoint == Z) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
252 oldpoint += len + nlflag; |
10393 | 253 if (oldzv == Z) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
254 oldzv += len + nlflag; |
10393 | 255 TEMP_SET_PT (Z); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
256 if (len) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
257 insert_1 (m, len, 1, 0); |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
258 if (nlflag) |
10393 | 259 { |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
260 int this_bol, prev_bol, dup; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
261 insert_1 ("\n", 1, 1, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
262 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
263 this_bol = scan_buffer ('\n', Z, 0, -2, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
264 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
265 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
266 prev_bol = scan_buffer ('\n', this_bol, 0, -2, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
267 dup = message_log_check_duplicate (prev_bol, this_bol); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
268 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
269 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
270 if (oldpoint > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
271 oldpoint -= min (this_bol, oldpoint) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
272 if (oldbegv > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
273 oldbegv -= min (this_bol, oldbegv) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
274 if (oldzv > prev_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
275 oldzv -= min (this_bol, oldzv) - prev_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
276 del_range_1 (prev_bol, this_bol, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
277 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
278 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
279 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
280 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
281 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
282 /* 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
|
283 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
284 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
285 duplen = strlen (dupstr); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
286 TEMP_SET_PT (Z-1); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
287 if (oldpoint == Z) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
288 oldpoint += duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
289 if (oldzv == Z) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
290 oldzv += duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
291 insert_1 (dupstr, duplen, 1, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
292 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
293 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
294 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
295 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
296 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
297 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
298 int pos = scan_buffer ('\n', Z, 0, |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
299 -XFASTINT (Vmessage_log_max) - 1, 0, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
300 oldpoint -= min (pos, oldpoint) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
301 oldbegv -= min (pos, oldbegv) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
302 oldzv -= min (pos, oldzv) - BEG; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
303 del_range_1 (BEG, pos, 0); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
304 } |
10393 | 305 } |
306 BEGV = oldbegv; | |
307 ZV = oldzv; | |
308 TEMP_SET_PT (oldpoint); | |
309 set_buffer_internal (oldbuf); | |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
310 message_log_need_newline = !nlflag; |
10393 | 311 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
312 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
313 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
314 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
315 /* 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
|
316 (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
|
317 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
|
318 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
|
319 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
|
320 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
321 static int |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
322 message_log_check_duplicate (prev_bol, this_bol) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
323 int prev_bol, this_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
324 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
325 int i; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
326 int len = Z - 1 - this_bol; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
327 int seen_dots = 0; |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
328 unsigned char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
329 unsigned char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
330 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
331 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
332 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
333 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
|
334 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
335 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
336 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
337 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
338 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
339 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
340 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
341 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
342 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
343 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
344 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
345 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
346 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
347 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
348 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
349 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
350 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
351 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
352 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
353 /* Display an echo area message M with a specified length of LEN chars. |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
354 The string may include null characters. If m is 0, clear out any |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
355 existing message, and let the minibuffer text show through. |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
356 Do not pass text that is stored in a Lisp string. */ |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
357 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
358 void |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
359 message2 (m, len) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
360 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
361 int len; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
362 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
363 /* 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
|
364 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
365 if (m) |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
366 message_dolog (m, len, 1); |
10393 | 367 message2_nolog (m, len); |
368 } | |
369 | |
370 | |
371 /* The non-logging part of that function. */ | |
372 | |
373 void | |
374 message2_nolog (m, len) | |
375 char *m; | |
376 int len; | |
377 { | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
378 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
379 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
380 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
381 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
382 noninteractive_need_newline = 0; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
383 fwrite (m, len, 1, stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
384 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
385 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
386 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
387 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
388 /* 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
|
389 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
390 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
|
391 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
392 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
393 #ifdef MULTI_FRAME |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
394 Lisp_Object minibuf_frame; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
395 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
396 choose_minibuf_frame (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
397 minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
398 FRAME_SAMPLE_VISIBILITY (XFRAME (minibuf_frame)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
399 if (FRAME_VISIBLE_P (selected_frame) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
400 && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame))) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
401 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
402 #endif |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
403 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
404 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
405 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
406 echo_area_glyphs = m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
407 echo_area_glyphs_length = len; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
408 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
409 else |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
410 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
|
411 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
412 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
|
413 echo_area_display (); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
414 update_frame (XFRAME (XWINDOW (minibuf_window)->frame), 1, 1); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
415 do_pending_window_change (); |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
416 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
417 (*frame_up_to_date_hook) (XFRAME (XWINDOW (minibuf_window)->frame)); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
418 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
419 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
420 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
421 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
422 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
423 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
424 { |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
425 message2 (m, (m ? strlen (m) : 0)); |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
426 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
427 |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
428 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
429 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
430 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
431 { |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
432 message2_nolog (m, (m ? strlen (m) : 0)); |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
433 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
434 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
435 /* 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
|
436 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
|
437 |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
438 void |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
439 truncate_echo_area (len) |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
440 int len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
441 { |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
442 /* 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
|
443 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
|
444 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
|
445 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
|
446 echo_area_glyphs_length = len; |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
447 } |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
448 |
769 | 449 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print; |
331 | 450 zero if being used by message. */ |
451 int message_buf_print; | |
452 | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
453 /* Dump an informative message to the minibuf. If m is 0, clear out |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
454 any existing message, and let the minibuffer text show through. */ |
277 | 455 /* VARARGS 1 */ |
456 void | |
457 message (m, a1, a2, a3) | |
458 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
459 EMACS_INT a1, a2, a3; |
277 | 460 { |
461 if (noninteractive) | |
462 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
463 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
464 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
465 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
|
466 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
|
467 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
|
468 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
469 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
470 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
|
471 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
472 } |
277 | 473 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
474 else if (INTERACTIVE) |
277 | 475 { |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
476 /* 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
|
477 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
|
478 to use its buffer, not the selected frame's buffer. */ |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
479 FRAME_PTR echo_frame; |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
480 #ifdef MULTI_FRAME |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
481 choose_minibuf_frame (); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
482 echo_frame = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
483 #else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
484 echo_frame = selected_frame; |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
485 #endif |
277 | 486 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
487 /* 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
|
488 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
|
489 cmd_error, so this must be just an informative message; toss it. */ |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
490 if (FRAME_MESSAGE_BUF (echo_frame)) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
491 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
492 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
493 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
494 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
|
495 #ifdef NO_ARG_ARRAY |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
496 EMACS_INT a[3]; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
497 a[0] = a1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
498 a[1] = a2; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
499 a[2] = a3; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
500 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
501 len = doprnt (FRAME_MESSAGE_BUF (echo_frame), |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
502 FRAME_WIDTH (echo_frame), m, 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
|
503 #else |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
504 len = doprnt (FRAME_MESSAGE_BUF (echo_frame), |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
505 FRAME_WIDTH (echo_frame), m, 0, 3, &a1); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
506 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
507 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
508 message2 (FRAME_MESSAGE_BUF (echo_frame), len); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
509 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
510 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
511 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
512 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
513 /* 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
|
514 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
|
515 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
|
516 } |
277 | 517 } |
518 } | |
519 | |
11193 | 520 /* The non-logging version of that function. */ |
521 void | |
522 message_nolog (m, a1, a2, a3) | |
523 char *m; | |
524 EMACS_INT a1, a2, a3; | |
525 { | |
526 Lisp_Object old_log_max; | |
527 old_log_max = Vmessage_log_max; | |
528 Vmessage_log_max = Qnil; | |
529 message (m, a1, a2, a3); | |
530 Vmessage_log_max = old_log_max; | |
531 } | |
532 | |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
533 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
534 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
535 { |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
536 message2 (echo_area_glyphs, echo_area_glyphs_length); |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
537 } |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
538 |
277 | 539 static void |
540 echo_area_display () | |
541 { | |
542 register int vpos; | |
769 | 543 FRAME_PTR f; |
277 | 544 |
769 | 545 #ifdef MULTI_FRAME |
546 choose_minibuf_frame (); | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
547 #endif |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
548 |
769 | 549 f = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); |
277 | 550 |
769 | 551 if (! FRAME_VISIBLE_P (f)) |
277 | 552 return; |
553 | |
769 | 554 if (frame_garbaged) |
277 | 555 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
556 redraw_garbaged_frames (); |
769 | 557 frame_garbaged = 0; |
277 | 558 } |
559 | |
560 if (echo_area_glyphs || minibuf_level == 0) | |
561 { | |
562 vpos = XFASTINT (XWINDOW (minibuf_window)->top); | |
769 | 563 get_display_line (f, vpos, 0); |
277 | 564 display_string (XWINDOW (minibuf_window), vpos, |
565 echo_area_glyphs ? echo_area_glyphs : "", | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
566 echo_area_glyphs ? echo_area_glyphs_length : -1, |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
567 0, 0, 0, 0, FRAME_WIDTH (f)); |
277 | 568 |
569 /* 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
|
570 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
|
571 FRAME_CURSOR_Y (f) = vpos; |
769 | 572 if (FRAME_CURSOR_Y (f) == vpos) |
573 FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; | |
727 | 574 |
575 /* Fill the rest of the minibuffer window with blank lines. */ | |
576 { | |
577 int i; | |
578 | |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
579 for (i = vpos + 1; |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
580 i < vpos + XFASTINT (XWINDOW (minibuf_window)->height); i++) |
727 | 581 { |
769 | 582 get_display_line (f, i, 0); |
727 | 583 display_string (XWINDOW (minibuf_window), vpos, |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
584 "", 0, 0, 0, 0, 0, FRAME_WIDTH (f)); |
727 | 585 } |
586 } | |
277 | 587 } |
588 else if (!EQ (minibuf_window, selected_window)) | |
589 windows_or_buffers_changed++; | |
590 | |
591 if (EQ (minibuf_window, selected_window)) | |
592 this_line_bufpos = 0; | |
593 | |
594 previous_echo_glyphs = echo_area_glyphs; | |
595 } | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
596 |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
597 #ifdef HAVE_X_WINDOWS |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
598 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
|
599 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
|
600 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
601 static int |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
602 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
|
603 char *str; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
604 int mincol, maxcol; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
605 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
606 char *limit; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
607 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
|
608 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
|
609 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
|
610 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
|
611 *frame_title_ptr++ = *str++; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
612 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
|
613 *frame_title_ptr++ = ' '; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
614 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
|
615 } |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
616 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
617 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
618 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
|
619 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
620 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
621 Lisp_Object fmt; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
622 struct buffer *obuf; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
623 int len; |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
624 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
|
625 |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
626 if (!FRAME_X_P (f) || FRAME_MINIBUF_ONLY_P (f) || f->explicit_name) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
627 return; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
628 multiple_frames = !EQ (Fnext_frame (frame, Qnil), frame); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
629 obuf = current_buffer; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
630 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
|
631 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
|
632 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
|
633 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
|
634 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
|
635 frame_title_ptr = 0; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
636 set_buffer_internal (obuf); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
637 /* 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
|
638 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
|
639 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
|
640 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
|
641 level than this.) */ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
642 if (! STRINGP (f->name) || XSTRING (f->name)->size != len |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
643 || 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
|
644 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
|
645 } |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
646 #else |
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
647 #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
|
648 #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
|
649 #endif |
277 | 650 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
651 /* Prepare for redisplay by updating menu-bar item lists when appropriate. |
11499 | 652 This can call eval. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
653 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
654 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
655 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
656 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
657 register struct window *w = XWINDOW (selected_window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
658 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
659 struct gcpro gcpro1, gcpro2; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
660 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
661 all_windows = (update_mode_lines || buffer_shared > 1 |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
662 || clip_changed || windows_or_buffers_changed); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
663 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
664 /* Update the menu bar item lists, if appropriate. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
665 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
|
666 or generation of display lines. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
667 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
668 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
669 Lisp_Object tail, frame; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
670 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
671 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
672 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
673 /* 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
|
674 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
|
675 if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame))) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
676 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
677 Lisp_Object functions; |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
678 /* 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
|
679 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
|
680 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
681 GCPRO2 (tail, functions); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
682 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
683 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
684 call1 (XCONS (functions)->car, frame); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
685 functions = XCONS (functions)->cdr; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
686 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
687 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
688 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
689 GCPRO1 (tail); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
690 update_menu_bar (XFRAME (frame)); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
691 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
692 } |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
693 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
694 else |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
695 update_menu_bar (selected_frame); |
11284
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
696 |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
697 /* Update all frame titles based on their buffer names, etc. |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
698 We do this after the menu bars so that the frame will first |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
699 create its menu bar using the name `emacs' if no other name |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
700 has yet been specified. */ |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
701 #ifdef HAVE_X_WINDOWS |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
702 if (windows_or_buffers_changed) |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
703 { |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
704 Lisp_Object tail, frame; |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
705 |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
706 FOR_EACH_FRAME (tail, frame) |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
707 if (FRAME_VISIBLE_P (XFRAME (frame)) |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
708 || FRAME_ICONIFIED_P (XFRAME (frame))) |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
709 x_consider_frame_title (frame); |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
710 } |
0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
Richard M. Stallman <rms@gnu.org>
parents:
11193
diff
changeset
|
711 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
712 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
713 |
769 | 714 /* Do a frame update, taking possible shortcuts into account. |
277 | 715 This is the main external entry point for redisplay. |
716 | |
717 If the last redisplay displayed an echo area message and that | |
718 message is no longer requested, we clear the echo area | |
719 or bring back the minibuffer if that is in use. | |
720 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
721 Do not call eval from within this function. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
722 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
|
723 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
|
724 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
|
725 but can still lose, because this function |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
726 can be called from signal handlers; with alarms set up; |
277 | 727 or with synchronous processes running. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
728 |
277 | 729 See Fcall_process; if you called it from here, it could be |
730 entered recursively. */ | |
731 | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
732 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
|
733 |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
734 /* 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
|
735 no more than once ever 1000 redisplays. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
736 static int clear_face_cache_count; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
737 |
277 | 738 void |
739 redisplay () | |
740 { | |
741 register struct window *w = XWINDOW (selected_window); | |
742 register int pause; | |
743 int must_finish = 0; | |
744 int all_windows; | |
745 register int tlbufpos, tlendpos; | |
746 struct position pos; | |
747 | |
748 if (noninteractive) | |
749 return; | |
750 | |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
751 /* 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
|
752 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
|
753 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
|
754 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
|
755 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
756 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
|
757 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
758 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
|
759 { |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
760 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
761 |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
762 /* 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
|
763 glyphs to display. */ |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
764 init_desired_glyphs (XFRAME (frame)); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
765 } |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
766 } |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
767 |
769 | 768 /* Notice any pending interrupt request to change frame size. */ |
277 | 769 do_pending_window_change (); |
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 | |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
777 prepare_menu_bars (); |
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
778 |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
779 if (clip_changed || windows_or_buffers_changed |
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
780 || (!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
|
781 && XFASTINT (w->column_number_displayed) != current_column ())) |
277 | 782 update_mode_lines++; |
783 | |
784 /* Detect case that we need to write a star in the mode line. */ | |
785 if (XFASTINT (w->last_modified) < MODIFF | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
786 && XFASTINT (w->last_modified) <= SAVE_MODIFF) |
277 | 787 { |
788 w->update_mode_line = Qt; | |
789 if (buffer_shared > 1) | |
790 update_mode_lines++; | |
791 } | |
792 | |
769 | 793 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; |
277 | 794 |
795 all_windows = update_mode_lines || buffer_shared > 1; | |
796 | |
797 /* If specs for an arrow have changed, do thorough redisplay | |
798 to ensure we remove any arrow that should no longer exist. */ | |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
799 if (! EQ (Voverlay_arrow_position, last_arrow_position) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
800 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
277 | 801 all_windows = 1, clip_changed = 1; |
802 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
803 /* 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
|
804 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
|
805 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
|
806 again here. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
807 if (echo_area_glyphs || previous_echo_glyphs) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
808 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
809 echo_area_display (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
810 must_finish = 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
811 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
812 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
813 /* 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
|
814 if (((!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
815 && !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
|
816 != !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
|
817 || (!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
|
818 && !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
|
819 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
|
820 this_line_bufpos = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
821 |
277 | 822 tlbufpos = this_line_bufpos; |
823 tlendpos = this_line_endpos; | |
485 | 824 if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line) |
769 | 825 && FRAME_VISIBLE_P (XFRAME (w->frame)) |
277 | 826 /* Make sure recorded data applies to current buffer, etc */ |
827 && this_line_buffer == current_buffer | |
828 && current_buffer == XBUFFER (w->buffer) | |
485 | 829 && NILP (w->force_start) |
277 | 830 /* Point must be on the line that we have info recorded about */ |
6705 | 831 && PT >= tlbufpos |
832 && PT <= Z - tlendpos | |
277 | 833 /* All text outside that line, including its final newline, |
834 must be unchanged */ | |
835 && (XFASTINT (w->last_modified) >= MODIFF | |
836 || (beg_unchanged >= tlbufpos - 1 | |
837 && GPT >= tlbufpos | |
528 | 838 /* If selective display, can't optimize |
839 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
|
840 && ((INTEGERP (current_buffer->selective_display) |
528 | 841 && XINT (current_buffer->selective_display) > 0 |
842 ? (beg_unchanged >= tlbufpos | |
843 && GPT > tlbufpos) | |
844 : 1)) | |
277 | 845 && end_unchanged >= tlendpos |
846 && Z - GPT >= tlendpos))) | |
847 { | |
848 if (tlbufpos > BEGV && FETCH_CHAR (tlbufpos - 1) != '\n' | |
849 && (tlbufpos == ZV | |
850 || FETCH_CHAR (tlbufpos) == '\n')) | |
851 /* Former continuation line has disappeared by becoming empty */ | |
852 goto cancel; | |
853 else if (XFASTINT (w->last_modified) < MODIFF | |
854 || MINI_WINDOW_P (w)) | |
855 { | |
856 cursor_vpos = -1; | |
857 overlay_arrow_seen = 0; | |
858 display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos, | |
859 pos_tab_offset (w, tlbufpos)); | |
860 /* If line contains point, is not continued, | |
861 and ends at same distance from eob as before, we win */ | |
862 if (cursor_vpos >= 0 && this_line_bufpos | |
863 && this_line_endpos == tlendpos) | |
864 { | |
6650
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
865 /* 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
|
866 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
|
867 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
|
868 < 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
|
869 { |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
870 int left = XFASTINT (w->left); |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
871 int *charstart_next_line |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
872 = 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
|
873 int adjust; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
874 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
875 if (Z - tlendpos == ZV) |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
876 /* 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
|
877 There is no newline to count. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
878 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
|
879 else |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
880 /* This line ends in a newline. |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
881 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
|
882 text that follows. */ |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
883 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
|
884 |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
885 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
|
886 } |
6619
b3631c88ec7e
(redisplay): Call adjust_window_charstarts
Richard M. Stallman <rms@gnu.org>
parents:
6612
diff
changeset
|
887 |
769 | 888 if (XFASTINT (w->width) != FRAME_WIDTH (XFRAME (WINDOW_FRAME (w)))) |
277 | 889 preserve_other_columns (w); |
890 goto update; | |
891 } | |
892 else | |
893 goto cancel; | |
894 } | |
6705 | 895 else if (PT == XFASTINT (w->last_point)) |
277 | 896 { |
897 if (!must_finish) | |
898 { | |
899 do_pending_window_change (); | |
900 return; | |
901 } | |
902 goto update; | |
903 } | |
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
904 /* 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
|
905 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
|
906 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
|
907 && !NILP (current_buffer->mark_active)) |
11641
748feea0a51a
(redisplay): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11531
diff
changeset
|
908 && 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
|
909 && !cursor_in_echo_area) |
277 | 910 { |
911 pos = *compute_motion (tlbufpos, 0, | |
912 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, | |
6705 | 913 PT, 2, - (1 << (SHORTBITS - 1)), |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
914 window_internal_width (w) - 1, |
574 | 915 XINT (w->hscroll), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
916 pos_tab_offset (w, tlbufpos), w); |
277 | 917 if (pos.vpos < 1) |
918 { | |
769 | 919 FRAME_CURSOR_X (selected_frame) |
277 | 920 = XFASTINT (w->left) + max (pos.hpos, 0); |
769 | 921 FRAME_CURSOR_Y (selected_frame) = this_line_vpos; |
277 | 922 goto update; |
923 } | |
924 else | |
925 goto cancel; | |
926 } | |
927 cancel: | |
928 /* Text changed drastically or point moved off of line */ | |
769 | 929 cancel_line (this_line_vpos, selected_frame); |
277 | 930 } |
931 | |
932 this_line_bufpos = 0; | |
933 all_windows |= buffer_shared > 1; | |
934 | |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
935 clear_face_cache_count++; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
936 |
277 | 937 if (all_windows) |
938 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
939 Lisp_Object tail, frame; |
277 | 940 |
9572 | 941 #ifdef HAVE_FACES |
9530
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
942 /* 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
|
943 and not too often either. */ |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
944 if (clear_face_cache_count > 1000) |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
945 { |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
946 clear_face_cache (); |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
947 clear_face_cache_count = 0; |
a605bfe5bf8a
(redisplay): Call clear_face_cache instead
Richard M. Stallman <rms@gnu.org>
parents:
9451
diff
changeset
|
948 } |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
949 #endif |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
950 |
277 | 951 /* Recompute # windows showing selected buffer. |
433 | 952 This will be incremented each time such a window is displayed. */ |
277 | 953 buffer_shared = 0; |
954 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
955 FOR_EACH_FRAME (tail, frame) |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
956 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
957 FRAME_PTR f = XFRAME (frame); |
10769
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
958 if (! FRAME_TERMCAP_P (f) || f == selected_frame) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
959 { |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
960 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
961 /* 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
|
962 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
|
963 if (condemn_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
964 (*condemn_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
965 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
966 if (FRAME_VISIBLE_P (f)) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
967 redisplay_windows (FRAME_ROOT_WINDOW (f)); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
968 |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
969 /* 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
|
970 should now go away. */ |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
971 if (judge_scroll_bars_hook) |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
972 (*judge_scroll_bars_hook) (f); |
813b186e70d8
(redisplay): Don't display nonselected terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
10764
diff
changeset
|
973 } |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
974 } |
277 | 975 } |
769 | 976 else if (FRAME_VISIBLE_P (selected_frame)) |
277 | 977 { |
978 redisplay_window (selected_window, 1); | |
769 | 979 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame)) |
277 | 980 preserve_other_columns (w); |
981 } | |
982 | |
983 update: | |
984 /* Prevent various kinds of signals during display update. | |
985 stdio is not robust about handling signals, | |
986 which can cause an apparent I/O error. */ | |
987 if (interrupt_input) | |
988 unrequest_sigio (); | |
989 stop_polling (); | |
990 | |
769 | 991 #ifdef MULTI_FRAME |
277 | 992 if (all_windows) |
993 { | |
994 Lisp_Object tail; | |
995 | |
996 pause = 0; | |
997 | |
769 | 998 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
277 | 999 { |
769 | 1000 FRAME_PTR f; |
277 | 1001 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1002 if (!FRAMEP (XCONS (tail)->car)) |
277 | 1003 continue; |
1004 | |
769 | 1005 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
|
1006 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
1007 if ((! FRAME_TERMCAP_P (f) || f == selected_frame) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
1008 && FRAME_VISIBLE_P (f)) |
277 | 1009 { |
769 | 1010 pause |= update_frame (f, 0, 0); |
277 | 1011 if (!pause) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1012 { |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1013 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
|
1014 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
|
1015 (*frame_up_to_date_hook) (f); |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1016 } |
277 | 1017 } |
1018 } | |
1019 } | |
1020 else | |
769 | 1021 #endif /* MULTI_FRAME */ |
368 | 1022 { |
769 | 1023 if (FRAME_VISIBLE_P (selected_frame)) |
1024 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
|
1025 else |
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1026 pause = 0; |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
1027 |
433 | 1028 /* We may have called echo_area_display at the top of this |
769 | 1029 function. If the echo area is on another frame, that may |
1030 have put text on a frame other than the selected one, so the | |
1031 above call to update_frame would not have caught it. Catch | |
433 | 1032 it here. */ |
1033 { | |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1034 FRAME_PTR mini_frame |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1035 = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); |
433 | 1036 |
769 | 1037 if (mini_frame != selected_frame) |
1038 pause |= update_frame (mini_frame, 0, 0); | |
433 | 1039 } |
368 | 1040 } |
277 | 1041 |
769 | 1042 /* If frame does not match, prevent doing single-line-update next time. |
277 | 1043 Also, don't forget to check every line to update the arrow. */ |
1044 if (pause) | |
1045 { | |
1046 this_line_bufpos = 0; | |
485 | 1047 if (!NILP (last_arrow_position)) |
277 | 1048 { |
1049 last_arrow_position = Qt; | |
1050 last_arrow_string = Qt; | |
1051 } | |
769 | 1052 /* If we pause after scrolling, some lines in current_frame |
277 | 1053 may be null, so preserve_other_columns won't be able to |
1054 preserve all the vertical-bar separators. So, avoid using it | |
1055 in that case. */ | |
769 | 1056 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame)) |
277 | 1057 update_mode_lines = 1; |
1058 } | |
1059 | |
769 | 1060 /* Now text on frame agrees with windows, so |
277 | 1061 put info into the windows for partial redisplay to follow */ |
1062 | |
1063 if (!pause) | |
1064 { | |
1065 register struct buffer *b = XBUFFER (w->buffer); | |
1066 | |
1067 blank_end_of_window = 0; | |
1068 clip_changed = 0; | |
1069 unchanged_modified = BUF_MODIFF (b); | |
1070 beg_unchanged = BUF_GPT (b) - BUF_BEG (b); | |
1071 end_unchanged = BUF_Z (b) - BUF_GPT (b); | |
1072 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1073 XSETFASTINT (w->last_point, BUF_PT (b)); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1074 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (selected_frame)); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1075 XSETFASTINT (w->last_point_y, FRAME_CURSOR_Y (selected_frame)); |
277 | 1076 |
1077 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
|
1078 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); |
277 | 1079 else |
1080 { | |
1081 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
|
1082 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1083 w->window_end_valid = w->buffer; |
277 | 1084 last_arrow_position = Voverlay_arrow_position; |
1085 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
|
1086 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
|
1087 verify_charstarts (w); |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
1088 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
|
1089 (*frame_up_to_date_hook) (selected_frame); |
277 | 1090 } |
1091 update_mode_lines = 0; | |
1092 windows_or_buffers_changed = 0; | |
1093 } | |
1094 | |
1095 /* Start SIGIO interrupts coming again. | |
1096 Having them off during the code above | |
1097 makes it less likely one will discard output, | |
1098 but not impossible, since there might be stuff | |
1099 in the system buffer here. | |
1100 But it is much hairier to try to do anything about that. */ | |
1101 | |
1102 if (interrupt_input) | |
1103 request_sigio (); | |
1104 start_polling (); | |
1105 | |
769 | 1106 /* Change frame size now if a change is pending. */ |
277 | 1107 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
|
1108 |
7b1a7e4c7694
(redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents:
7473
diff
changeset
|
1109 /* If we just did a pending size change, redisplay again |
7b1a7e4c7694
(redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents:
7473
diff
changeset
|
1110 for the new size. */ |
7757
8d27747de7ca
(redisplay): Limit prev change to pause != 0.
Richard M. Stallman <rms@gnu.org>
parents:
7752
diff
changeset
|
1111 if (windows_or_buffers_changed && !pause) |
7752
7b1a7e4c7694
(redisplay): If have window change at end, redisplay again.
Richard M. Stallman <rms@gnu.org>
parents:
7473
diff
changeset
|
1112 redisplay (); |
277 | 1113 } |
1114 | |
1115 /* Redisplay, but leave alone any recent echo area message | |
1116 unless another message has been requested in its place. | |
1117 | |
1118 This is useful in situations where you need to redisplay but no | |
1119 user action has occurred, making it inappropriate for the message | |
1120 area to be cleared. See tracking_off and | |
1121 wait_reading_process_input for examples of these situations. */ | |
1122 | |
1123 redisplay_preserve_echo_area () | |
1124 { | |
1125 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0) | |
1126 { | |
1127 echo_area_glyphs = previous_echo_glyphs; | |
1128 redisplay (); | |
1129 echo_area_glyphs = 0; | |
1130 } | |
1131 else | |
1132 redisplay (); | |
1133 } | |
1134 | |
1135 void | |
1136 mark_window_display_accurate (window, flag) | |
1137 Lisp_Object window; | |
1138 int flag; | |
1139 { | |
1140 register struct window *w; | |
1141 | |
485 | 1142 for (;!NILP (window); window = w->next) |
277 | 1143 { |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
1144 if (!WINDOWP (window)) abort (); |
277 | 1145 w = XWINDOW (window); |
1146 | |
485 | 1147 if (!NILP (w->buffer)) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1148 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1149 XSETFASTINT (w->last_modified, |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1150 !flag ? 0 : BUF_MODIFF (XBUFFER (w->buffer))); |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1151 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1152 /* 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
|
1153 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
|
1154 w->region_showing = (!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1155 && !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
|
1156 ? 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
|
1157 : Qnil); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1158 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1159 |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1160 w->window_end_valid = w->buffer; |
277 | 1161 w->update_mode_line = Qnil; |
1162 | |
485 | 1163 if (!NILP (w->vchild)) |
277 | 1164 mark_window_display_accurate (w->vchild, flag); |
485 | 1165 if (!NILP (w->hchild)) |
277 | 1166 mark_window_display_accurate (w->hchild, flag); |
1167 } | |
1168 | |
1169 if (flag) | |
1170 { | |
1171 last_arrow_position = Voverlay_arrow_position; | |
1172 last_arrow_string = Voverlay_arrow_string; | |
1173 } | |
1174 else | |
1175 { | |
1176 /* t is unequal to any useful value of Voverlay_arrow_... */ | |
1177 last_arrow_position = Qt; | |
1178 last_arrow_string = Qt; | |
1179 } | |
1180 } | |
1181 | |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1182 /* 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
|
1183 This has to be done before we start to fill in any display lines, |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1184 because it can call eval. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1185 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1186 static void |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1187 update_menu_bar (f) |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1188 FRAME_PTR f; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1189 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1190 struct buffer *old = current_buffer; |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1191 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1192 register struct window *w; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1193 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1194 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1195 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1196 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1197 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1198 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1199 if ( |
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
|
1200 #ifdef USE_X_TOOLKIT |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1201 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
|
1202 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1203 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
|
1204 #endif |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
1205 ) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1206 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1207 /* 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
|
1208 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
|
1209 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
|
1210 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
|
1211 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
|
1212 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
|
1213 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1214 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
|
1215 || !NILP (w->update_mode_line) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1216 || (XFASTINT (w->last_modified) < MODIFF |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1217 && (XFASTINT (w->last_modified) |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1218 <= BUF_SAVE_MODIFF (XBUFFER (w->buffer))))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1219 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1220 struct buffer *prev = current_buffer; |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
1221 call1 (Vrun_hooks, Qmenu_bar_update_hook); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1222 current_buffer = XBUFFER (w->buffer); |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
1223 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1224 current_buffer = prev; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
1225 #ifdef USE_X_TOOLKIT |
6630
cd036c4e1dfd
(update_menu_bar): Pass 0 to set_frame_menubar.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6628
diff
changeset
|
1226 set_frame_menubar (f, 0); |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
1227 #endif /* USE_X_TOOLKIT */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1228 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1229 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1230 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1231 |
277 | 1232 int do_id = 1; |
1233 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1234 /* Redisplay WINDOW and its subwindows and siblings. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1235 |
277 | 1236 static void |
1237 redisplay_windows (window) | |
1238 Lisp_Object window; | |
1239 { | |
485 | 1240 for (; !NILP (window); window = XWINDOW (window)->next) |
277 | 1241 redisplay_window (window, 0); |
1242 } | |
1243 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1244 /* Redisplay window WINDOW and its subwindows. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1245 |
277 | 1246 static void |
1247 redisplay_window (window, just_this_one) | |
1248 Lisp_Object window; | |
1249 int just_this_one; | |
1250 { | |
1251 register struct window *w = XWINDOW (window); | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
1252 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 1253 int height; |
6705 | 1254 register int lpoint = PT; |
277 | 1255 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
|
1256 register int width = window_internal_width (w) - 1; |
277 | 1257 register int startp; |
1258 register int hscroll = XINT (w->hscroll); | |
1259 struct position pos; | |
6705 | 1260 int opoint = PT; |
277 | 1261 int tem; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1262 int update_mode_line; |
277 | 1263 |
769 | 1264 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
277 | 1265 |
1266 /* If this is a combination window, do its children; that's all. */ | |
1267 | |
485 | 1268 if (!NILP (w->vchild)) |
277 | 1269 { |
1270 redisplay_windows (w->vchild); | |
1271 return; | |
1272 } | |
485 | 1273 if (!NILP (w->hchild)) |
277 | 1274 { |
1275 redisplay_windows (w->hchild); | |
1276 return; | |
1277 } | |
485 | 1278 if (NILP (w->buffer)) |
277 | 1279 abort (); |
433 | 1280 |
1281 height = window_internal_height (w); | |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1282 update_mode_line = (!NILP (w->update_mode_line) || update_mode_lines); |
433 | 1283 |
1284 if (MINI_WINDOW_P (w)) | |
1285 { | |
1286 if (w == XWINDOW (minibuf_window)) | |
1287 { | |
1288 if (echo_area_glyphs) | |
1289 /* We've already displayed the echo area glyphs, if any. */ | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1290 goto finish_scroll_bars; |
433 | 1291 } |
1292 else | |
1293 { | |
1294 /* This is a minibuffer, but it's not the currently active one, so | |
1295 clear it. */ | |
769 | 1296 int vpos = XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top); |
433 | 1297 int i; |
1298 | |
1299 for (i = 0; i < height; i++) | |
1300 { | |
769 | 1301 get_display_line (f, vpos + i, 0); |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
1302 display_string (w, vpos + i, "", 0, 0, 0, 1, 0, width); |
433 | 1303 } |
1304 | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1305 goto finish_scroll_bars; |
433 | 1306 } |
1307 } | |
277 | 1308 |
1309 /* Otherwise set up data on this window; select its buffer and point value */ | |
1310 | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1311 if (update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1312 set_buffer_internal (XBUFFER (w->buffer)); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1313 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1314 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
|
1315 |
6705 | 1316 opoint = PT; |
277 | 1317 |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1318 /* 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
|
1319 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
|
1320 |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1321 if (!just_this_one) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1322 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1323 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1324 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1325 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
|
1326 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1327 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1328 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1329 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1330 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1331 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
1332 } |
277 | 1333 |
1334 /* POINT refers normally to the selected window. | |
1335 For any other window, set up appropriate value. */ | |
1336 | |
1337 if (!EQ (window, selected_window)) | |
1338 { | |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1339 int new_pt = marker_position (w->pointm); |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1340 if (new_pt < BEGV) |
277 | 1341 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1342 new_pt = BEGV; |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1343 Fset_marker (w->pointm, make_number (new_pt), Qnil); |
277 | 1344 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1345 else if (new_pt > (ZV - 1)) |
277 | 1346 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1347 new_pt = ZV; |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1348 Fset_marker (w->pointm, make_number (new_pt), Qnil); |
277 | 1349 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1350 /* We don't use SET_PT so that the point-motion hooks don't run. */ |
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1351 BUF_PT (current_buffer) = new_pt; |
277 | 1352 } |
1353 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1354 /* 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
|
1355 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
|
1356 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
|
1357 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
|
1358 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
|
1359 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
|
1360 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1361 struct Lisp_Vector *disptab = buffer_display_table (); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1362 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1363 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
|
1364 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
|
1365 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1366 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
|
1367 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
|
1368 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1369 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
|
1370 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1371 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
1372 |
277 | 1373 /* If window-start is screwed up, choose a new one. */ |
1374 if (XMARKER (w->start)->buffer != current_buffer) | |
1375 goto recenter; | |
1376 | |
1377 startp = marker_position (w->start); | |
1378 | |
433 | 1379 /* 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
|
1380 unless the specified location is outside the accessible range. */ |
485 | 1381 if (!NILP (w->force_start)) |
277 | 1382 { |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1383 /* 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
|
1384 w->base_line_number = Qnil; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1385 /* 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
|
1386 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1387 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1388 set_buffer_temp (old); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1389 set_buffer_internal (XBUFFER (w->buffer)); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1390 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1391 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1392 } |
277 | 1393 w->force_start = Qnil; |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1394 XSETFASTINT (w->last_modified, 0); |
433 | 1395 if (startp < BEGV) startp = BEGV; |
1396 if (startp > ZV) startp = ZV; | |
277 | 1397 try_window (window, startp); |
1398 if (cursor_vpos < 0) | |
1399 { | |
1400 /* If point does not appear, move point so it does appear */ | |
1401 pos = *compute_motion (startp, 0, | |
1402 ((EQ (window, minibuf_window) && startp == 1) | |
1403 ? minibuf_prompt_width : 0) | |
1404 + | |
1405 (hscroll ? 1 - hscroll : 0), | |
1406 ZV, height / 2, | |
1407 - (1 << (SHORTBITS - 1)), | |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1408 width, hscroll, pos_tab_offset (w, startp), w); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1409 BUF_PT (current_buffer) = pos.bufpos; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1410 if (w != XWINDOW (selected_window)) |
6705 | 1411 Fset_marker (w->pointm, make_number (PT), Qnil); |
277 | 1412 else |
1413 { | |
5340
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
1414 if (current_buffer == old) |
6705 | 1415 lpoint = PT; |
769 | 1416 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left); |
1417 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); | |
277 | 1418 } |
9218
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
1419 /* 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
|
1420 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
|
1421 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
|
1422 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1423 { |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1424 cancel_my_columns (XWINDOW (window)); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1425 try_window (window, startp); |
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
1426 } |
277 | 1427 } |
1428 goto done; | |
1429 } | |
1430 | |
1431 /* Handle case where text has not changed, only point, | |
769 | 1432 and it has not moved off the frame */ |
277 | 1433 |
1434 /* This code is not used for minibuffer for the sake of | |
1435 the case of redisplaying to replace an echo area message; | |
1436 since in that case the minibuffer contents per se are usually unchanged. | |
1437 This code is of no real use in the minibuffer since | |
1438 the handling of this_line_bufpos, etc., | |
1439 in redisplay handles the same cases. */ | |
1440 | |
1441 if (XFASTINT (w->last_modified) >= MODIFF | |
6705 | 1442 && PT >= startp && !clip_changed |
769 | 1443 && (just_this_one || XFASTINT (w->width) == FRAME_WIDTH (f)) |
11085
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
1444 /* 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
|
1445 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
|
1446 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
|
1447 && 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
|
1448 /* 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
|
1449 && !(!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
|
1450 && 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
|
1451 /* 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
|
1452 && 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
|
1453 && XFASTINT (w->window_end_vpos) < XFASTINT (w->height) |
277 | 1454 && !EQ (window, minibuf_window)) |
1455 { | |
1456 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), | |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
1457 PT, height, 0, width, hscroll, |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1458 pos_tab_offset (w, startp), w); |
277 | 1459 |
1460 if (pos.vpos < height) | |
1461 { | |
769 | 1462 /* Ok, point is still on frame */ |
1463 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
277 | 1464 { |
1465 /* These variables are supposed to be origin 1 */ | |
769 | 1466 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left); |
1467 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); | |
277 | 1468 } |
1469 /* This doesn't do the trick, because if a window to the right of | |
1470 this one must be redisplayed, this does nothing because there | |
769 | 1471 is nothing in DesiredFrame yet, and then the other window is |
277 | 1472 redisplayed, making likes that are empty in this window's columns. |
769 | 1473 if (XFASTINT (w->width) != FRAME_WIDTH (f)) |
277 | 1474 preserve_my_columns (w); |
1475 */ | |
1476 goto done; | |
1477 } | |
1478 /* Don't bother trying redisplay with same start; | |
1479 we already know it will lose */ | |
1480 } | |
1481 /* If current starting point was originally the beginning of a line | |
1482 but no longer is, find a new starting point. */ | |
485 | 1483 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
|
1484 && !(startp <= BEGV |
277 | 1485 || FETCH_CHAR (startp - 1) == '\n')) |
1486 { | |
1487 goto recenter; | |
1488 } | |
1489 else if (just_this_one && !MINI_WINDOW_P (w) | |
6705 | 1490 && PT >= startp |
277 | 1491 && 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
|
1492 /* 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
|
1493 && ! NILP (w->start_at_line_beg) |
277 | 1494 && ! EQ (w->window_end_valid, Qnil) |
1495 && do_id && !clip_changed | |
1496 && !blank_end_of_window | |
769 | 1497 && XFASTINT (w->width) == FRAME_WIDTH (f) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1498 /* 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
|
1499 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1500 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1501 && NILP (w->region_showing) |
277 | 1502 && EQ (last_arrow_position, Voverlay_arrow_position) |
1503 && EQ (last_arrow_string, Voverlay_arrow_string) | |
769 | 1504 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f))) |
277 | 1505 && tem != -2) |
1506 { | |
1507 /* tem > 0 means success. tem == -1 means choose new start. | |
1508 tem == -2 means try again with same start, | |
1509 and nothing but whitespace follows the changed stuff. | |
1510 tem == 0 means try again with same start. */ | |
1511 if (tem > 0) | |
1512 goto done; | |
1513 } | |
1514 else if (startp >= BEGV && startp <= ZV | |
1515 /* Avoid starting display at end of buffer! */ | |
433 | 1516 && (startp < ZV || startp == BEGV |
277 | 1517 || (XFASTINT (w->last_modified) >= MODIFF))) |
1518 { | |
1519 /* Try to redisplay starting at same place as before */ | |
769 | 1520 /* If point has not moved off frame, accept the results */ |
277 | 1521 try_window (window, startp); |
1522 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1523 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1524 if (!just_this_one || clip_changed || beg_unchanged < startp) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1525 /* 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
|
1526 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1527 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1528 } |
277 | 1529 else |
1530 cancel_my_columns (w); | |
1531 } | |
1532 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1533 XSETFASTINT (w->last_modified, 0); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1534 /* 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
|
1535 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1536 { |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1537 set_buffer_temp (old); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1538 set_buffer_internal (XBUFFER (w->buffer)); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1539 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1540 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1541 } |
277 | 1542 |
1543 /* Try to scroll by specified few lines */ | |
1544 | |
1545 if (scroll_step && !clip_changed) | |
1546 { | |
6705 | 1547 if (PT > startp) |
277 | 1548 { |
1549 pos = *vmotion (Z - XFASTINT (w->window_end_pos), | |
1550 scroll_step, width, hscroll, window); | |
1551 if (pos.vpos >= height) | |
1552 goto scroll_fail; | |
1553 } | |
1554 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
1555 pos = *vmotion (startp, |
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
1556 (PT < startp ? - scroll_step : scroll_step), |
277 | 1557 width, hscroll, window); |
1558 | |
6705 | 1559 if (PT >= pos.bufpos) |
277 | 1560 { |
1561 try_window (window, pos.bufpos); | |
1562 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1563 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1564 if (!just_this_one || clip_changed || beg_unchanged < startp) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1565 /* 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
|
1566 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1567 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1568 } |
277 | 1569 else |
1570 cancel_my_columns (w); | |
1571 } | |
1572 scroll_fail: ; | |
1573 } | |
1574 | |
1575 /* Finally, just choose place to start which centers point */ | |
1576 | |
1577 recenter: | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1578 /* 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
|
1579 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1580 |
6705 | 1581 pos = *vmotion (PT, - (height / 2), width, hscroll, window); |
277 | 1582 try_window (window, pos.bufpos); |
1583 | |
1584 startp = marker_position (w->start); | |
8594
4d8d02befd11
(redisplay_window): Don't access text before BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
8514
diff
changeset
|
1585 w->start_at_line_beg |
4d8d02befd11
(redisplay_window): Don't access text before BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
8514
diff
changeset
|
1586 = (startp == BEGV || FETCH_CHAR (startp - 1) == '\n') ? Qt : Qnil; |
277 | 1587 |
1588 done: | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1589 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1590 /* 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
|
1591 if the window to its side is being redone */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1592 || (!just_this_one && width < FRAME_WIDTH (f) - 1) |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
1593 || 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
|
1594 || (!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
|
1595 && XFASTINT (w->column_number_displayed) != current_column ())) |
277 | 1596 && height != XFASTINT (w->height)) |
1597 display_mode_line (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1598 if (! line_number_displayed |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1599 && ! BUFFERP (w->base_line_pos)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1600 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1601 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1602 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1603 } |
277 | 1604 |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1605 /* 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
|
1606 if (update_mode_line |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
1607 #ifdef USE_X_TOOLKIT |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
1608 && FRAME_EXTERNAL_MENU_BAR (f) |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
1609 #else |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1610 && 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
|
1611 #endif |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1612 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1613 display_menu_bar (w); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1614 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1615 finish_scroll_bars: |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1616 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
|
1617 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1618 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1619 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1620 /* 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
|
1621 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
|
1622 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
|
1623 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
|
1624 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
1625 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1626 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
|
1627 if (! MINI_WINDOW_P (w) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1628 || (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
|
1629 { |
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
|
1630 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
1631 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
|
1632 /* 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
|
1633 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
|
1634 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
|
1635 |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
1636 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
|
1637 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
|
1638 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1639 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1640 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1641 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1642 /* 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
|
1643 (*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
|
1644 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1645 /* 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
|
1646 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
|
1647 (*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
|
1648 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1649 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1650 BUF_PT (current_buffer) = opoint; |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1651 if (update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1652 set_buffer_internal (old); |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1653 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
1654 set_buffer_temp (old); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
1655 BUF_PT (current_buffer) = lpoint; |
277 | 1656 } |
1657 | |
1658 /* Do full redisplay on one window, starting at position `pos'. */ | |
1659 | |
1660 static void | |
1661 try_window (window, pos) | |
1662 Lisp_Object window; | |
1663 register int pos; | |
1664 { | |
1665 register struct window *w = XWINDOW (window); | |
1666 register int height = window_internal_height (w); | |
1667 register int vpos = XFASTINT (w->top); | |
1668 register int last_text_vpos = vpos; | |
1669 int tab_offset = pos_tab_offset (w, pos); | |
769 | 1670 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
|
1671 int width = window_internal_width (w) - 1; |
277 | 1672 struct position val; |
1673 | |
1674 Fset_marker (w->start, make_number (pos), Qnil); | |
1675 cursor_vpos = -1; | |
1676 overlay_arrow_seen = 0; | |
1677 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; | |
1678 | |
1679 while (--height >= 0) | |
1680 { | |
1681 val = *display_text_line (w, pos, vpos, val.hpos, tab_offset); | |
1682 tab_offset += width; | |
10641
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1683 /* For the first line displayed, display_text_line |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1684 subtracts the prompt width from the tab offset. |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1685 But it does not affect the value of our variable tab_offset. |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1686 So we do the subtraction again, |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1687 for the sake of continuation lines of that first line. */ |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1688 if (MINI_WINDOW_P (w) && vpos == XFASTINT (w->top)) |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1689 tab_offset -= minibuf_prompt_width; |
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
1690 |
277 | 1691 if (val.vpos) tab_offset = 0; |
1692 vpos++; | |
1693 if (pos != val.bufpos) | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1694 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1695 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
|
1696 #ifdef USE_TEXT_PROPERTIES |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1697 Lisp_Object invis_prop; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1698 invis_prop = Fget_char_property (val.bufpos-1, Qinvisible, window); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1699 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
|
1700 #endif |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1701 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1702 last_text_vpos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1703 /* 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
|
1704 = vpos - (val.vpos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1705 && (FETCH_CHAR (val.bufpos - 1) != '\n' || invis)); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
1706 } |
277 | 1707 pos = val.bufpos; |
1708 } | |
1709 | |
1710 /* If last line is continued in middle of character, | |
769 | 1711 include the split character in the text considered on the frame */ |
277 | 1712 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
1713 pos++; | |
1714 | |
769 | 1715 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 1716 if (XFASTINT (w->window_end_pos) == 0 |
1717 && Z != pos) | |
1718 w->update_mode_line = Qt; | |
1719 | |
769 | 1720 /* 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
|
1721 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
|
1722 XSETFASTINT (w->window_end_vpos, last_text_vpos - XFASTINT (w->top)); |
277 | 1723 /* But that is not valid info until redisplay finishes. */ |
1724 w->window_end_valid = Qnil; | |
1725 } | |
1726 | |
1727 /* Try to redisplay when buffer is modified locally, | |
1728 computing insert/delete line to preserve text outside | |
1729 the bounds of the changes. | |
1730 Return 1 if successful, 0 if if cannot tell what to do, | |
1731 or -1 to tell caller to find a new window start, | |
1732 or -2 to tell caller to do normal redisplay with same window start. */ | |
1733 | |
1734 static int | |
1735 try_window_id (window) | |
1736 Lisp_Object window; | |
1737 { | |
1738 int pos; | |
1739 register struct window *w = XWINDOW (window); | |
1740 register int height = window_internal_height (w); | |
769 | 1741 FRAME_PTR f = XFRAME (w->frame); |
277 | 1742 int top = XFASTINT (w->top); |
1743 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
|
1744 int width = window_internal_width (w) - 1; |
277 | 1745 int hscroll = XINT (w->hscroll); |
1746 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
1747 register int vpos; | |
1748 register int i, tem; | |
1749 int last_text_vpos = 0; | |
1750 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
|
1751 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
|
1752 ? 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
|
1753 : !NILP (current_buffer->selective_display) ? -1 : 0); |
277 | 1754 |
1755 struct position val, bp, ep, xp, pp; | |
1756 int scroll_amount = 0; | |
1757 int delta; | |
1758 int tab_offset, epto; | |
1759 | |
1760 if (GPT - BEG < beg_unchanged) | |
1761 beg_unchanged = GPT - BEG; | |
1762 if (Z - GPT < end_unchanged) | |
1763 end_unchanged = Z - GPT; | |
1764 | |
5739
0709eb474647
(try_window_id): Don't pass value beyond ZV to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
5676
diff
changeset
|
1765 if (beg_unchanged + BEG < start) |
277 | 1766 return 0; /* Give up if changes go above top of window */ |
1767 | |
1768 /* Find position before which nothing is changed. */ | |
1769 bp = *compute_motion (start, 0, lmargin, | |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
1770 min (ZV, beg_unchanged + BEG), height, 0, |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1771 width, hscroll, pos_tab_offset (w, start), w); |
277 | 1772 if (bp.vpos >= height) |
368 | 1773 { |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
1774 if (PT < bp.bufpos) |
368 | 1775 { |
769 | 1776 /* All changes are below the frame, and point is on the frame. |
1777 We don't need to change the frame at all. | |
368 | 1778 But we need to update window_end_pos to account for |
1779 any change in buffer size. */ | |
371 | 1780 bp = *compute_motion (start, 0, lmargin, |
1781 Z, height, 0, | |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1782 width, hscroll, pos_tab_offset (w, start), w); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
1783 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
|
1784 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
|
1785 goto findpoint; |
368 | 1786 } |
1787 return 0; | |
1788 } | |
277 | 1789 |
1790 vpos = bp.vpos; | |
1791 | |
769 | 1792 /* Find beginning of that frame line. Must display from there. */ |
277 | 1793 bp = *vmotion (bp.bufpos, 0, width, hscroll, window); |
1794 | |
1795 pos = bp.bufpos; | |
1796 val.hpos = lmargin; | |
1797 if (pos < start) | |
1798 return -1; | |
1799 | |
1800 /* If about to start displaying at the beginning of a continuation line, | |
769 | 1801 really start with previous frame line, in case it was not |
277 | 1802 continued when last redisplayed */ |
528 | 1803 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0) |
1804 || | |
1805 /* 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
|
1806 (selective > 0 && bp.bufpos - 1 == beg_unchanged && vpos > 0)) |
277 | 1807 { |
1808 bp = *vmotion (bp.bufpos, -1, width, hscroll, window); | |
1809 --vpos; | |
1810 pos = bp.bufpos; | |
1811 } | |
1812 | |
1813 if (bp.contin && bp.hpos != lmargin) | |
1814 { | |
1815 val.hpos = bp.prevhpos - width + lmargin; | |
1816 pos--; | |
1817 } | |
1818 | |
1819 bp.vpos = vpos; | |
1820 | |
1821 /* Find first visible newline after which no more is changed. */ | |
1822 tem = find_next_newline (Z - max (end_unchanged, Z - ZV), 1); | |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
1823 if (selective > 0) |
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
1824 while (tem < ZV - 1 && (indented_beyond_p (tem, selective))) |
277 | 1825 tem = find_next_newline (tem, 1); |
1826 | |
1827 /* Compute the cursor position after that newline. */ | |
1828 ep = *compute_motion (pos, vpos, val.hpos, tem, | |
1829 height, - (1 << (SHORTBITS - 1)), | |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1830 width, hscroll, pos_tab_offset (w, bp.bufpos), w); |
277 | 1831 |
769 | 1832 /* If changes reach past the text available on the frame, |
1833 just display rest of frame. */ | |
277 | 1834 if (ep.bufpos > Z - XFASTINT (w->window_end_pos)) |
1835 stop_vpos = height; | |
1836 else | |
1837 stop_vpos = ep.vpos; | |
1838 | |
1839 /* If no newline before ep, the line ep is on includes some changes | |
1840 that must be displayed. Make sure we don't stop before it. */ | |
1841 /* Also, if changes reach all the way until ep.bufpos, | |
1842 it is possible that something was deleted after the | |
1843 newline before it, so the following line must be redrawn. */ | |
1844 if (stop_vpos == ep.vpos | |
1845 && (ep.bufpos == BEGV | |
1846 || FETCH_CHAR (ep.bufpos - 1) != '\n' | |
1847 || ep.bufpos == Z - end_unchanged)) | |
1848 stop_vpos = ep.vpos + 1; | |
1849 | |
1850 cursor_vpos = -1; | |
1851 overlay_arrow_seen = 0; | |
1852 | |
1853 /* If changes do not reach to bottom of window, | |
1854 figure out how much to scroll the rest of the window */ | |
1855 if (stop_vpos < height) | |
1856 { | |
1857 /* Now determine how far up or down the rest of the window has moved */ | |
1858 epto = pos_tab_offset (w, ep.bufpos); | |
1859 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, | |
1860 Z - XFASTINT (w->window_end_pos), | |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1861 10000, 0, width, hscroll, epto, w); |
277 | 1862 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos); |
1863 | |
769 | 1864 /* Is everything on frame below the changes whitespace? |
277 | 1865 If so, no scrolling is really necessary. */ |
1866 for (i = ep.bufpos; i < xp.bufpos; i++) | |
1867 { | |
1868 tem = FETCH_CHAR (i); | |
1869 if (tem != ' ' && tem != '\n' && tem != '\t') | |
1870 break; | |
1871 } | |
1872 if (i == xp.bufpos) | |
1873 return -2; | |
1874 | |
9330
28fcacb58a38
(try_window_id): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9325
diff
changeset
|
1875 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
|
1876 XFASTINT (w->window_end_vpos) + scroll_amount); |
277 | 1877 |
769 | 1878 /* Before doing any scrolling, verify that point will be on frame. */ |
6705 | 1879 if (PT > ep.bufpos && !(PT <= xp.bufpos && xp.bufpos < height)) |
277 | 1880 { |
6705 | 1881 if (PT <= xp.bufpos) |
277 | 1882 { |
1883 pp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, | |
6705 | 1884 PT, height, - (1 << (SHORTBITS - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1885 width, hscroll, epto, w); |
277 | 1886 } |
1887 else | |
1888 { | |
1889 pp = *compute_motion (xp.bufpos, xp.vpos, xp.hpos, | |
6705 | 1890 PT, height, - (1 << (SHORTBITS - 1)), |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1891 width, hscroll, |
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
1892 pos_tab_offset (w, xp.bufpos), w); |
277 | 1893 } |
6705 | 1894 if (pp.bufpos < PT || pp.vpos == height) |
277 | 1895 return 0; |
1896 cursor_vpos = pp.vpos + top; | |
1897 cursor_hpos = pp.hpos + XFASTINT (w->left); | |
1898 } | |
1899 | |
1900 if (stop_vpos - scroll_amount >= height | |
1901 || ep.bufpos == xp.bufpos) | |
1902 { | |
1903 if (scroll_amount < 0) | |
1904 stop_vpos -= scroll_amount; | |
1905 scroll_amount = 0; | |
1906 /* In this path, we have altered window_end_vpos | |
1907 and not left it negative. | |
1908 We must make sure that, in case display is preempted | |
769 | 1909 before the frame changes to reflect what we do here, |
277 | 1910 further updates will not come to try_window_id |
769 | 1911 and assume the frame and window_end_vpos match. */ |
277 | 1912 blank_end_of_window = 1; |
1913 } | |
1914 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
|
1915 { |
a406a09cb770
(redisplay): do_verify_charstarts controls whether to call verify_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6643
diff
changeset
|
1916 /* 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
|
1917 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
|
1918 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
|
1919 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
|
1920 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
|
1921 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
|
1922 } |
277 | 1923 else if (bp.bufpos == Z - end_unchanged) |
1924 { | |
1925 /* If reprinting everything is nearly as fast as scrolling, | |
1926 don't bother scrolling. Can happen if lines are short. */ | |
769 | 1927 if (scroll_cost (f, bp.vpos + top - scroll_amount, |
277 | 1928 top + height - max (0, scroll_amount), |
1929 scroll_amount) | |
1930 > xp.bufpos - bp.bufpos - 20) | |
1931 /* Return "try normal display with same window-start." | |
1932 Too bad we can't prevent further scroll-thinking. */ | |
1933 return -2; | |
1934 /* If pure deletion, scroll up as many lines as possible. | |
1935 In common case of killing a line, this can save the | |
1936 following line from being overwritten by scrolling | |
1937 and therefore having to be redrawn. */ | |
769 | 1938 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
|
1939 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
|
1940 scroll_amount, bp.bufpos); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1941 if (!tem) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1942 stop_vpos = height; |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1943 else |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1944 { |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1945 /* 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
|
1946 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
|
1947 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
|
1948 (This can happen in a deletion that ends in mid-line.) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1949 To adjust properly, we need to make things constent at |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1950 the position ep. |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1951 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
|
1952 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
|
1953 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
|
1954 int oldstart |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1955 = 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
|
1956 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
|
1957 ep.bufpos - oldstart); |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
1958 } |
277 | 1959 } |
1960 else if (scroll_amount) | |
1961 { | |
1962 /* If reprinting everything is nearly as fast as scrolling, | |
1963 don't bother scrolling. Can happen if lines are short. */ | |
1964 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an | |
1965 overestimate of cost of reprinting, since xp.bufpos | |
1966 would end up below the bottom of the window. */ | |
769 | 1967 if (scroll_cost (f, ep.vpos + top - scroll_amount, |
277 | 1968 top + height - max (0, scroll_amount), |
1969 scroll_amount) | |
1970 > xp.bufpos - ep.bufpos - 20) | |
1971 /* Return "try normal display with same window-start." | |
1972 Too bad we can't prevent further scroll-thinking. */ | |
1973 return -2; | |
769 | 1974 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount, |
277 | 1975 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
|
1976 scroll_amount, ep.bufpos); |
277 | 1977 if (!tem) stop_vpos = height; |
1978 } | |
1979 } | |
1980 | |
1981 /* In any case, do not display past bottom of window */ | |
1982 if (stop_vpos >= height) | |
1983 { | |
1984 stop_vpos = height; | |
1985 scroll_amount = 0; | |
1986 } | |
1987 | |
1988 /* Handle case where pos is before w->start -- | |
1989 can happen if part of line had been clipped and is not clipped now */ | |
1990 if (vpos == 0 && pos < marker_position (w->start)) | |
1991 Fset_marker (w->start, make_number (pos), Qnil); | |
1992 | |
1993 /* Redisplay the lines where the text was changed */ | |
1994 last_text_vpos = vpos; | |
1995 tab_offset = pos_tab_offset (w, pos); | |
1996 /* If we are starting display in mid-character, correct tab_offset | |
1997 to account for passing the line that that character really starts in. */ | |
1998 if (val.hpos < lmargin) | |
1999 tab_offset += width; | |
2000 while (vpos < stop_vpos) | |
2001 { | |
2002 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset); | |
2003 tab_offset += width; | |
2004 if (val.vpos) tab_offset = 0; | |
2005 if (pos != val.bufpos) | |
2006 last_text_vpos | |
2007 /* Next line, unless prev line ended in end of buffer with no cr */ | |
2008 = vpos - (val.vpos && FETCH_CHAR (val.bufpos - 1) != '\n'); | |
2009 pos = val.bufpos; | |
2010 } | |
2011 | |
2012 /* There are two cases: | |
2013 1) we have displayed down to the bottom of the window | |
2014 2) we have scrolled lines below stop_vpos by scroll_amount */ | |
2015 | |
2016 if (vpos == height) | |
2017 { | |
2018 /* If last line is continued in middle of character, | |
769 | 2019 include the split character in the text considered on the frame */ |
277 | 2020 if (val.hpos < lmargin) |
2021 val.bufpos++; | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2022 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
|
2023 XSETFASTINT (w->window_end_pos, Z - val.bufpos); |
277 | 2024 } |
2025 | |
2026 /* If scrolling made blank lines at window bottom, | |
2027 redisplay to fill those lines */ | |
2028 if (scroll_amount < 0) | |
2029 { | |
2030 /* Don't consider these lines for general-purpose scrolling. | |
2031 That will save time in the scrolling computation. */ | |
769 | 2032 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos; |
277 | 2033 vpos = xp.vpos; |
2034 pos = xp.bufpos; | |
2035 val.hpos = lmargin; | |
2036 if (pos == ZV) | |
2037 vpos = height + scroll_amount; | |
2038 else if (xp.contin && xp.hpos != lmargin) | |
2039 { | |
2040 val.hpos = xp.prevhpos - width + lmargin; | |
2041 pos--; | |
2042 } | |
2043 | |
2044 blank_end_of_window = 1; | |
2045 tab_offset = pos_tab_offset (w, pos); | |
2046 /* If we are starting display in mid-character, correct tab_offset | |
2047 to account for passing the line that that character starts in. */ | |
2048 if (val.hpos < lmargin) | |
2049 tab_offset += width; | |
2050 | |
2051 while (vpos < height) | |
2052 { | |
2053 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset); | |
2054 tab_offset += width; | |
2055 if (val.vpos) tab_offset = 0; | |
2056 pos = val.bufpos; | |
2057 } | |
2058 | |
2059 /* Here is a case where display_text_line sets cursor_vpos wrong. | |
2060 Make it be fixed up, below. */ | |
2061 if (xp.bufpos == ZV | |
6705 | 2062 && xp.bufpos == PT) |
277 | 2063 cursor_vpos = -1; |
2064 } | |
2065 | |
769 | 2066 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 2067 if (XFASTINT (w->window_end_pos) == 0 |
2068 && Z != val.bufpos) | |
2069 w->update_mode_line = Qt; | |
2070 | |
2071 /* Attempt to adjust end-of-text positions to new bottom line */ | |
2072 if (scroll_amount) | |
2073 { | |
2074 delta = height - xp.vpos; | |
2075 if (delta < 0 | |
2076 || (delta > 0 && xp.bufpos <= ZV) | |
2077 || (delta == 0 && xp.hpos)) | |
2078 { | |
2079 val = *vmotion (Z - XFASTINT (w->window_end_pos), | |
2080 delta, width, hscroll, window); | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2081 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
|
2082 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
|
2083 XFASTINT (w->window_end_vpos) + val.vpos); |
277 | 2084 } |
2085 } | |
2086 | |
2087 w->window_end_valid = Qnil; | |
2088 | |
2089 /* If point was not in a line that was displayed, find it */ | |
2090 if (cursor_vpos < 0) | |
2091 { | |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
2092 findpoint: |
6705 | 2093 val = *compute_motion (start, 0, lmargin, PT, 10000, 10000, |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2094 width, hscroll, pos_tab_offset (w, start), w); |
769 | 2095 /* Admit failure if point is off frame now */ |
277 | 2096 if (val.vpos >= height) |
2097 { | |
2098 for (vpos = 0; vpos < height; vpos++) | |
769 | 2099 cancel_line (vpos + top, f); |
277 | 2100 return 0; |
2101 } | |
2102 cursor_vpos = val.vpos + top; | |
2103 cursor_hpos = val.hpos + XFASTINT (w->left); | |
2104 } | |
2105 | |
769 | 2106 FRAME_CURSOR_X (f) = max (0, cursor_hpos); |
2107 FRAME_CURSOR_Y (f) = cursor_vpos; | |
277 | 2108 |
2109 if (debug_end_pos) | |
2110 { | |
2111 val = *compute_motion (start, 0, lmargin, ZV, | |
2112 height, - (1 << (SHORTBITS - 1)), | |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6684
diff
changeset
|
2113 width, hscroll, pos_tab_offset (w, start), w); |
277 | 2114 if (val.vpos != XFASTINT (w->window_end_vpos)) |
2115 abort (); | |
2116 if (XFASTINT (w->window_end_pos) | |
2117 != Z - val.bufpos) | |
2118 abort (); | |
2119 } | |
2120 | |
2121 return 1; | |
2122 } | |
2123 | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2124 /* Mark a section of BUF as modified, but only for the sake of redisplay. |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2125 This is useful for recording changes to overlays. |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2126 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2127 We increment the buffer's modification timestamp and set the |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2128 redisplay caches (windows_or_buffers_changed, beg_unchanged, etc) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2129 as if the region of text between START and END had been modified; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2130 the redisplay code will check this against the windows' timestamps, |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2131 and redraw the appropriate area of the buffer. |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2132 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2133 However, if the buffer is unmodified, we bump the last-save |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2134 timestamp as well, so that incrementing the timestamp doesn't fool |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2135 Emacs into thinking that the buffer's text has been modified. |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2136 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2137 Tweaking the timestamps shouldn't hurt the first-modification |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2138 timestamps recorded in the undo records; those values aren't |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2139 written until just before a real text modification is made, so they |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2140 will never catch the timestamp value just before this function gets |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2141 called. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2142 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2143 void |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2144 redisplay_region (buf, start, end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2145 struct buffer *buf; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2146 int start, end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2147 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2148 if (start == end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2149 return; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2150 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2151 if (start > end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2152 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2153 int temp = start; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2154 start = end; end = temp; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2155 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2156 |
7933
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2157 /* If this is a buffer not in the selected window, |
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2158 we must do other windows. */ |
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2159 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2160 windows_or_buffers_changed = 1; |
8075
b546fa7e9911
(redisplay_region): For special treatment, BUF most be
Richard M. Stallman <rms@gnu.org>
parents:
7951
diff
changeset
|
2161 /* If it's not current, we can't use beg_unchanged, end_unchanged for it. */ |
b546fa7e9911
(redisplay_region): For special treatment, BUF most be
Richard M. Stallman <rms@gnu.org>
parents:
7951
diff
changeset
|
2162 else if (buf != current_buffer) |
b546fa7e9911
(redisplay_region): For special treatment, BUF most be
Richard M. Stallman <rms@gnu.org>
parents:
7951
diff
changeset
|
2163 windows_or_buffers_changed = 1; |
7933
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2164 /* If multiple windows show this buffer, we must do other windows. */ |
f997d5dc44d8
(redisplay_region): Treat selected window's buffer
Richard M. Stallman <rms@gnu.org>
parents:
7927
diff
changeset
|
2165 else if (buffer_shared > 1) |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2166 windows_or_buffers_changed = 1; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2167 else |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2168 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2169 if (unchanged_modified == MODIFF) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2170 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2171 beg_unchanged = start - BEG; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2172 end_unchanged = Z - end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2173 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2174 else |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2175 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2176 if (Z - end < end_unchanged) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2177 end_unchanged = Z - end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2178 if (start - BEG < beg_unchanged) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2179 beg_unchanged = start - BEG; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2180 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2181 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2182 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2183 /* Increment the buffer's time stamp, but also increment the save |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
2184 and autosave timestamps, so as not to screw up that timekeeping. */ |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
2185 if (BUF_MODIFF (buf) == BUF_SAVE_MODIFF (buf)) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
2186 BUF_SAVE_MODIFF (buf)++; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2187 if (BUF_MODIFF (buf) == buf->auto_save_modified) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2188 buf->auto_save_modified++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2189 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2190 BUF_MODIFF (buf) ++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2191 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2192 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2193 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2194 /* Copy LEN glyphs starting address FROM to the rope TO. |
301 | 2195 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
|
2196 Value is TO, advanced past the copied data. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2197 F is the frame we are displaying in. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2198 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2199 static GLYPH * |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2200 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
|
2201 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2202 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
|
2203 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
|
2204 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
|
2205 int len; |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2206 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
|
2207 { |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2208 int n = len; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2209 register Lisp_Object *fp = from; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2210 /* 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
|
2211 int last_code = -1; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2212 int last_merged = 0; |
277 | 2213 |
9572 | 2214 #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
|
2215 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
|
2216 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
|
2217 { |
6740
255869831639
(copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents:
6721
diff
changeset
|
2218 int 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
|
2219 int facecode; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2220 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2221 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
|
2222 /* 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
|
2223 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
|
2224 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
|
2225 /* 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
|
2226 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
|
2227 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2228 { |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2229 /* 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
|
2230 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
|
2231 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
|
2232 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2233 |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2234 if (to >= s) |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2235 *to = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), facecode); |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2236 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2237 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2238 } |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2239 else |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2240 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2241 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
|
2242 { |
6741
840862375e93
(copy_part_of_rope): Replace non-glyph with 0.
Karl Heuer <kwzh@gnu.org>
parents:
6740
diff
changeset
|
2243 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
|
2244 ++to; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2245 ++fp; |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2246 } |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2247 return to; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2248 } |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2249 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2250 /* 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
|
2251 with a displayable computed face code. */ |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2252 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2253 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
|
2254 fix_glyph (f, glyph, cface) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2255 FRAME_PTR f; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2256 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
|
2257 int cface; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2258 { |
9572 | 2259 #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
|
2260 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
|
2261 { |
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
|
2262 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
|
2263 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
|
2264 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
|
2265 } |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2266 #endif |
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2267 return glyph; |
277 | 2268 } |
2269 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2270 /* Display one line of window W, starting at position START in W's buffer. |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2271 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2272 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
|
2273 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
|
2274 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
|
2275 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
|
2276 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
|
2277 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
|
2278 account. |
277 | 2279 |
2280 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations. | |
2281 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2282 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
|
2283 the top of the frame, not W. |
277 | 2284 |
2285 Returns a STRUCT POSITION giving character to start next line with | |
2286 and where to display it, including a zero or negative hpos. | |
2287 The vpos field is not really a vpos; it is 1 unless the line is continued */ | |
2288 | |
2289 struct position val_display_text_line; | |
2290 | |
2291 static struct position * | |
2292 display_text_line (w, start, vpos, hpos, taboffset) | |
2293 struct window *w; | |
2294 int start; | |
2295 int vpos; | |
2296 int hpos; | |
2297 int taboffset; | |
2298 { | |
2299 register int pos = start; | |
2300 register int c; | |
2301 register GLYPH *p1; | |
2302 int end; | |
2303 register int pause; | |
2304 register unsigned char *p; | |
2305 GLYPH *endp; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2306 register GLYPH *leftmargin; |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2307 register GLYPH *p1prev = 0; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2308 register GLYPH *p1start; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2309 int *charstart; |
769 | 2310 FRAME_PTR f = XFRAME (w->frame); |
277 | 2311 int tab_width = XINT (current_buffer->tab_width); |
485 | 2312 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
|
2313 int width = window_internal_width (w) - 1; |
277 | 2314 struct position val; |
2315 int lastpos; | |
2316 int invis; | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2317 int last_invis_skip = 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2318 Lisp_Object last_invis_prop; |
277 | 2319 int hscroll = XINT (w->hscroll); |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2320 int truncate = (hscroll |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2321 || (truncate_partial_width_windows |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2322 && XFASTINT (w->width) < FRAME_WIDTH (f)) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2323 || !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
|
2324 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2325 /* 1 if we should highlight the region. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2326 int highlight_region |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2327 = !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
|
2328 int region_beg, region_end; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2329 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2330 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
|
2331 ? 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
|
2332 : !NILP (current_buffer->selective_display) ? -1 : 0); |
769 | 2333 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 2334 register struct Lisp_Vector *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
|
2335 |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2336 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
|
2337 /* 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
|
2338 if it calls for an ellipsis. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2339 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
|
2340 selective display is enabled--you must check that separately. */ |
277 | 2341 int selective_rlen |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2342 = (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
|
2343 ? 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
|
2344 : !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
|
2345 /* 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
|
2346 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
|
2347 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
|
2348 = (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
|
2349 ? 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
|
2350 : default_invis_vector); |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2351 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2352 GLYPH truncator = (dp == 0 || !INTEGERP (DISP_TRUNC_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2353 ? '$' : 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
|
2354 GLYPH continuer = (dp == 0 || !INTEGERP (DISP_CONTINUE_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2355 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp))); |
277 | 2356 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2357 /* 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
|
2358 to overlays or text property changes. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2359 int next_face_change; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2360 |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2361 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2362 /* The next location where the `invisible' property changes */ |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2363 int next_invisible; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2364 #endif |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2365 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2366 /* 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
|
2367 int current_face = 0; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2368 int i; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2369 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2370 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
|
2371 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
|
2372 |
277 | 2373 hpos += XFASTINT (w->left); |
769 | 2374 get_display_line (f, vpos, XFASTINT (w->left)); |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
2375 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 2376 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2377 /* Show where to highlight the region. */ |
2965
5314fdcd87bc
(display_text_line): Highlight in any frame's sel window.
Richard M. Stallman <rms@gnu.org>
parents:
2929
diff
changeset
|
2378 if (highlight_region && XMARKER (current_buffer->mark)->buffer != 0 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
2379 /* 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
|
2380 && (highlight_nonselected_windows |
3266
1173bc4814da
(display_text_line): Really check for just the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3265
diff
changeset
|
2381 || w == XWINDOW (selected_window))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2382 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2383 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
|
2384 if (PT < region_beg) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2385 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2386 region_end = region_beg; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2387 region_beg = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2388 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2389 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2390 region_end = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2391 w->region_showing = Qt; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2392 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2393 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2394 region_beg = region_end = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2395 |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2396 if (MINI_WINDOW_P (w) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2397 && start == 1 |
277 | 2398 && vpos == XFASTINT (w->top)) |
2399 { | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
2400 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
|
2401 { |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2402 minibuf_prompt_width |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
2403 = (display_string (w, vpos, XSTRING (minibuf_prompt)->data, |
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
2404 XSTRING (minibuf_prompt)->size, hpos, |
9756
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2405 /* 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
|
2406 ' ', |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2407 1, -1, |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2408 /* 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
|
2409 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
|
2410 on the first line. */ |
bd5dc931e46e
(display_text_line): Truncate the minibuf_prompt if nec.
Richard M. Stallman <rms@gnu.org>
parents:
9682
diff
changeset
|
2411 w->width > 10 ? w->width - 4 : -1) |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2412 - hpos); |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2413 hpos += minibuf_prompt_width; |
10641
88afc23d1474
(display_text_line): Deduct minibuf prompt from taboffset.
Richard M. Stallman <rms@gnu.org>
parents:
10567
diff
changeset
|
2414 taboffset -= minibuf_prompt_width; |
6721
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2415 } |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2416 else |
26e4c96d8b63
(display_text_line): minibuffer_prompt_width is a distance, not an absolute
Karl Heuer <kwzh@gnu.org>
parents:
6705
diff
changeset
|
2417 minibuf_prompt_width = 0; |
277 | 2418 } |
2419 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2420 end = ZV; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2421 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2422 /* 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
|
2423 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
|
2424 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
|
2425 if (hpos < 0) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2426 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2427 struct position *left_edge |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2428 = compute_motion (pos, vpos, hpos, |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2429 end, vpos, 0, |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2430 width, hscroll, taboffset, w); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2431 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2432 /* 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
|
2433 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
|
2434 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
|
2435 the left margin. |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2436 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2437 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
|
2438 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
|
2439 the line. If so, back up. */ |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2440 if (left_edge->vpos > vpos |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2441 || left_edge->hpos > 0) |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2442 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2443 pos = left_edge->bufpos - 1; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2444 hpos = left_edge->prevhpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2445 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2446 else |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2447 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2448 pos = left_edge->bufpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2449 hpos = left_edge->hpos; |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2450 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2451 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2452 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
2453 desired_glyphs->bufp[vpos] = start; |
277 | 2454 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
|
2455 p1start = p1; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2456 charstart = desired_glyphs->charstarts[vpos] + hpos; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2457 /* In case we don't ever write anything into it... */ |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2458 desired_glyphs->charstarts[vpos][XFASTINT (w->left)] = -1; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2459 leftmargin = desired_glyphs->glyphs[vpos] + XFASTINT (w->left); |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2460 endp = leftmargin + width; |
277 | 2461 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2462 /* 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
|
2463 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
|
2464 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
|
2465 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
|
2466 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
|
2467 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
|
2468 |
277 | 2469 /* Loop generating characters. |
2470 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
|
2471 if reach or pass continuation column, |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2472 or at face change. */ |
277 | 2473 pause = pos; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2474 next_face_change = pos; |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2475 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2476 next_invisible = pos; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2477 #endif |
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
2478 while (1) |
277 | 2479 { |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2480 /* Record which glyph starts a character, |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2481 and the character position of that character. */ |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2482 if (p1 >= leftmargin) |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2483 charstart[p1 - p1start] = pos; |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2484 |
6643
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
2485 if (p1 >= endp) |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
2486 break; |
07be9ae289ce
(display_text_line): Always store in charstart
Richard M. Stallman <rms@gnu.org>
parents:
6630
diff
changeset
|
2487 |
277 | 2488 p1prev = p1; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2489 if (pos >= pause) |
277 | 2490 { |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2491 /* Did we hit the end of the visible region of the buffer? |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2492 Stop here. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2493 if (pos >= end) |
277 | 2494 break; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2495 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2496 /* Did we reach point? Record the cursor location. */ |
6705 | 2497 if (pos == PT && cursor_vpos < 0) |
277 | 2498 { |
2499 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2500 cursor_hpos = p1 - leftmargin; |
277 | 2501 } |
2502 | |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2503 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2504 /* if the `invisible' property is set to t, we can skip to |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2505 the next property change */ |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2506 while (pos == next_invisible && pos < end) |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2507 { |
9987
0a50658ec6f9
(try_window, display_text_line): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9981
diff
changeset
|
2508 Lisp_Object position, limit, endpos, prop, ww; |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2509 XSETFASTINT (position, pos); |
9987
0a50658ec6f9
(try_window, display_text_line): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9981
diff
changeset
|
2510 XSETWINDOW (ww, w); |
0a50658ec6f9
(try_window, display_text_line): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9981
diff
changeset
|
2511 prop = Fget_char_property (position, Qinvisible, ww); |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2512 /* This is just an estimate to give reasonable |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2513 performance; nothing should go wrong if it is too small. */ |
6091
b634e16673ab
(display_text_line): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6066
diff
changeset
|
2514 limit = Fnext_overlay_change (position); |
b634e16673ab
(display_text_line): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6066
diff
changeset
|
2515 if (XFASTINT (limit) > pos + 50) |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2516 XSETFASTINT (limit, pos + 50); |
6091
b634e16673ab
(display_text_line): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6066
diff
changeset
|
2517 endpos = Fnext_single_property_change (position, Qinvisible, |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2518 Fcurrent_buffer (), |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2519 limit); |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2520 if (INTEGERP (endpos)) |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2521 next_invisible = XINT (endpos); |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2522 else |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2523 next_invisible = end; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2524 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2525 { |
6705 | 2526 if (pos < PT && next_invisible >= PT) |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2527 { |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2528 cursor_vpos = vpos; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2529 cursor_hpos = p1 - leftmargin; |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2530 } |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2531 pos = next_invisible; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2532 last_invis_skip = pos; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2533 last_invis_prop = prop; |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2534 } |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2535 } |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2536 if (pos >= end) |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2537 break; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2538 #endif |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2539 |
9572 | 2540 #ifdef HAVE_FACES |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2541 /* Did we hit a face change? Figure out what face we should |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2542 use now. We also hit this the first time through the |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2543 loop, to see what face we should start with. */ |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2544 if (pos >= next_face_change && FRAME_X_P (f)) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2545 current_face = compute_char_face (f, w, pos, |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
2546 region_beg, region_end, |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2547 &next_face_change, pos + 50, 0); |
2742
7800e6a86421
* xdisp.c (display_text_line): Make face-handling code conditional
Jim Blandy <jimb@redhat.com>
parents:
2729
diff
changeset
|
2548 #endif |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2549 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2550 pause = end; |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2551 |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2552 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2553 if (pos < next_invisible && next_invisible < pause) |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2554 pause = next_invisible; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2555 #endif |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2556 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
|
2557 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
|
2558 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2559 /* 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
|
2560 the phone? */ |
6705 | 2561 if (pos < PT && PT < pause) |
2562 pause = PT; | |
277 | 2563 if (pos < GPT && GPT < pause) |
2564 pause = GPT; | |
2565 | |
2566 p = &FETCH_CHAR (pos); | |
2567 } | |
2568 c = *p++; | |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2569 /* 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
|
2570 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
|
2571 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2572 p1 = copy_part_of_rope (f, p1, leftmargin, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2573 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2574 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2575 current_face); |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2576 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
2577 else if (c >= 040 && c < 0177) |
277 | 2578 { |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2579 if (p1 >= leftmargin) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2580 *p1 = MAKE_GLYPH (f, c, current_face); |
277 | 2581 p1++; |
2582 } | |
2583 else if (c == '\n') | |
2584 { | |
2585 invis = 0; | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2586 if (last_invis_skip == pos |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
2587 && 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
|
2588 invis = 1; |
7473
e19c18ae2d02
(display_text_line): Fix check for end of buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7292
diff
changeset
|
2589 while (pos + 1 < end |
277 | 2590 && selective > 0 |
5942
c51e1ff87656
(try_window_id, display_text_line): Treat blank lines specially in
Karl Heuer <kwzh@gnu.org>
parents:
5936
diff
changeset
|
2591 && indented_beyond_p (pos + 1, selective)) |
277 | 2592 { |
2593 invis = 1; | |
2594 pos = find_next_newline (pos + 1, 1); | |
2595 if (FETCH_CHAR (pos - 1) == '\n') | |
2596 pos--; | |
2597 } | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2598 if (invis && selective_rlen > 0 && p1 >= leftmargin) |
277 | 2599 { |
2600 p1 += selective_rlen; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2601 if (p1 - leftmargin > width) |
277 | 2602 p1 = endp; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2603 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2604 (p1 - p1prev), current_face); |
277 | 2605 } |
9572 | 2606 #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
|
2607 /* 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
|
2608 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
|
2609 if (current_face) |
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2610 { |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2611 if (p1 < leftmargin) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2612 p1 = leftmargin; |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2613 while (p1 < endp) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2614 *p1++ = FAST_MAKE_GLYPH (' ', current_face); |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2615 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2616 #endif |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2617 break; |
277 | 2618 } |
2619 else if (c == '\t') | |
2620 { | |
2621 do | |
2622 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2623 if (p1 >= leftmargin && p1 < endp) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2624 *p1 = MAKE_GLYPH (f, ' ', current_face); |
277 | 2625 p1++; |
2626 } | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2627 while ((p1 - leftmargin + taboffset + hscroll - (hscroll > 0)) |
277 | 2628 % tab_width); |
2629 } | |
368 | 2630 else if (c == Ctl ('M') && selective == -1) |
277 | 2631 { |
2632 pos = find_next_newline (pos, 1); | |
2633 if (FETCH_CHAR (pos - 1) == '\n') | |
2634 pos--; | |
2635 if (selective_rlen > 0) | |
2636 { | |
2637 p1 += selective_rlen; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2638 if (p1 - leftmargin > width) |
277 | 2639 p1 = endp; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2640 copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents, |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2641 (p1 - p1prev), current_face); |
277 | 2642 } |
9572 | 2643 #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
|
2644 /* 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
|
2645 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
|
2646 if (current_face) |
7772
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2647 { |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2648 if (p1 < leftmargin) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2649 p1 = leftmargin; |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2650 while (p1 < endp) |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2651 *p1++ = FAST_MAKE_GLYPH (' ', current_face); |
7821be0db092
(display_text_line): Make sure pointer is in range.
Karl Heuer <kwzh@gnu.org>
parents:
7757
diff
changeset
|
2652 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2653 #endif |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2654 break; |
277 | 2655 } |
2656 else if (c < 0200 && ctl_arrow) | |
2657 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2658 if (p1 >= leftmargin) |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2659 *p1 = fix_glyph (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2660 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2661 current_face); |
277 | 2662 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2663 if (p1 >= leftmargin && p1 < endp) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2664 *p1 = MAKE_GLYPH (f, c ^ 0100, current_face); |
277 | 2665 p1++; |
2666 } | |
2667 else | |
2668 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2669 if (p1 >= leftmargin) |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2670 *p1 = fix_glyph (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2671 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2672 current_face); |
277 | 2673 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2674 if (p1 >= leftmargin && p1 < endp) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2675 *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face); |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2676 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2677 if (p1 >= leftmargin && p1 < endp) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2678 *p1 = MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face); |
277 | 2679 p1++; |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2680 if (p1 >= leftmargin && p1 < endp) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
2681 *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face); |
277 | 2682 p1++; |
2683 } | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2684 |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2685 /* Do nothing here for a char that's entirely off the left edge. */ |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2686 if (p1 >= leftmargin) |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2687 { |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2688 /* For all the glyphs occupied by this character, except for the |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2689 first, store -1 in charstarts. */ |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2690 if (p1 != p1prev) |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2691 { |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2692 int *p2x = &charstart[p1prev - p1start]; |
8684
020c4d5b685b
(display_text_line): Don't overrun the charstart area.
Richard M. Stallman <rms@gnu.org>
parents:
8622
diff
changeset
|
2693 int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start]; |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2694 |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2695 /* The window's left column should always |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2696 contain a character position. |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2697 And don't clobber anything to the left of that. */ |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2698 if (p1prev < leftmargin) |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2699 { |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2700 p2x = charstart + (leftmargin - p1start); |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2701 *p2x = pos; |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2702 } |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2703 |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2704 /* This loop skips over the char p2x initially points to. */ |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2705 while (++p2x < p2) |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2706 *p2x = -1; |
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2707 } |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2708 } |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
2709 |
277 | 2710 pos++; |
2711 } | |
2712 | |
2713 val.hpos = - XINT (w->hscroll); | |
2714 if (val.hpos) | |
2715 val.hpos++; | |
2716 | |
2717 val.vpos = 1; | |
2718 | |
2719 lastpos = pos; | |
2720 | |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2721 /* 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
|
2722 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
|
2723 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
|
2724 /* 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
|
2725 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
|
2726 internal width. */ |
7292
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2727 i = p1 - p1start + 1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2728 if (p1 < leftmargin) |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2729 i += leftmargin - p1; |
b5b5ca91f463
(display_text_line): Since HPOS is negative, avoid
Richard M. Stallman <rms@gnu.org>
parents:
7197
diff
changeset
|
2730 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
|
2731 charstart[i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
2732 |
277 | 2733 /* Handle continuation in middle of a character */ |
2734 /* by backing up over it */ | |
2735 if (p1 > endp) | |
2736 { | |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2737 /* 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
|
2738 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
|
2739 if (p1prev) |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2740 { |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2741 /* Start the next line with that same character */ |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2742 pos--; |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2743 /* but at negative hpos, to skip the columns output on this line. */ |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2744 val.hpos += p1prev - endp; |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2745 } |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2746 |
277 | 2747 /* Keep in this line everything up to the continuation column. */ |
2748 p1 = endp; | |
2749 } | |
2750 | |
2751 /* Finish deciding which character to start the next line on, | |
2752 and what hpos to start it at. | |
2753 Also set `lastpos' to the last position which counts as "on this line" | |
2754 for cursor-positioning. */ | |
2755 | |
2756 if (pos < ZV) | |
2757 { | |
2758 if (FETCH_CHAR (pos) == '\n') | |
6568
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2759 { |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2760 /* If stopped due to a newline, start next line after it */ |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2761 pos++; |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2762 /* 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
|
2763 at the right margin. */ |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2764 while (pos < ZV && selective > 0 |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2765 && indented_beyond_p (pos, selective)) |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2766 pos = find_next_newline (pos, 1); |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2767 } |
277 | 2768 else |
2769 /* Stopped due to right margin of window */ | |
2770 { | |
2771 if (truncate) | |
2772 { | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2773 *p1++ = fix_glyph (f, truncator, 0); |
277 | 2774 /* Truncating => start next line after next newline, |
2775 and point is on this line if it is before the newline, | |
2776 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
|
2777 do |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2778 pos = find_next_newline (pos, 1); |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2779 while (pos < ZV && selective > 0 |
c87ae1f14148
(display_text_line): Handle selective display at window edge.
Karl Heuer <kwzh@gnu.org>
parents:
6518
diff
changeset
|
2780 && indented_beyond_p (pos, selective)); |
277 | 2781 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; |
2782 | |
2783 lastpos = pos - (FETCH_CHAR (pos - 1) == '\n'); | |
2784 } | |
2785 else | |
2786 { | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2787 *p1++ = fix_glyph (f, continuer, 0); |
277 | 2788 val.vpos = 0; |
2789 lastpos--; | |
2790 } | |
2791 } | |
2792 } | |
2793 | |
2794 /* If point is at eol or in invisible text at eol, | |
769 | 2795 record its frame location now. */ |
277 | 2796 |
6705 | 2797 if (start <= PT && PT <= lastpos && cursor_vpos < 0) |
277 | 2798 { |
2799 cursor_vpos = vpos; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2800 cursor_hpos = p1 - leftmargin; |
277 | 2801 } |
2802 | |
2803 if (cursor_vpos == vpos) | |
2804 { | |
2805 if (cursor_hpos < 0) cursor_hpos = 0; | |
2806 if (cursor_hpos > width) cursor_hpos = width; | |
2807 cursor_hpos += XFASTINT (w->left); | |
769 | 2808 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) |
277 | 2809 { |
11649
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
2810 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
|
2811 && 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
|
2812 { |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
2813 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
|
2814 FRAME_CURSOR_X (f) = cursor_hpos; |
d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
Karl Heuer <kwzh@gnu.org>
parents:
11641
diff
changeset
|
2815 } |
277 | 2816 |
2817 if (w == XWINDOW (selected_window)) | |
2818 { | |
2819 /* Line is not continued and did not start | |
2820 in middle of character */ | |
2821 if ((hpos - XFASTINT (w->left) | |
2822 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) | |
2823 && val.vpos) | |
2824 { | |
2825 this_line_bufpos = start; | |
2826 this_line_buffer = current_buffer; | |
2827 this_line_vpos = cursor_vpos; | |
2828 this_line_start_hpos = hpos; | |
2829 this_line_endpos = Z - lastpos; | |
2830 } | |
2831 else | |
2832 this_line_bufpos = 0; | |
2833 } | |
2834 } | |
2835 } | |
2836 | |
2837 /* If hscroll and line not empty, insert truncation-at-left marker */ | |
2838 if (hscroll && lastpos != start) | |
2839 { | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2840 *leftmargin = fix_glyph (f, truncator, 0); |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2841 if (p1 <= leftmargin) |
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2842 p1 = leftmargin + 1; |
277 | 2843 } |
2844 | |
769 | 2845 if (XFASTINT (w->width) + XFASTINT (w->left) != FRAME_WIDTH (f)) |
277 | 2846 { |
2847 endp++; | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
2848 if (p1 < leftmargin) p1 = leftmargin; |
277 | 2849 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
|
2850 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2851 /* 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
|
2852 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
|
2853 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
|
2854 reconfigured. */ |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2855 *p1++ = (FRAME_HAS_VERTICAL_SCROLL_BARS (f) |
8919
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8918
diff
changeset
|
2856 ? ' ' |
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8918
diff
changeset
|
2857 : (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) |
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8918
diff
changeset
|
2858 ? DISP_BORDER_GLYPH (dp) |
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8918
diff
changeset
|
2859 : '|')); |
277 | 2860 } |
2861 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], | |
2862 p1 - desired_glyphs->glyphs[vpos]); | |
2863 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
2864 | |
2865 /* If the start of this line is the overlay arrow-position, | |
2866 then put the arrow string into the display-line. */ | |
2867 | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
2868 if (MARKERP (Voverlay_arrow_position) |
277 | 2869 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
2870 && 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
|
2871 && STRINGP (Voverlay_arrow_string) |
277 | 2872 && ! overlay_arrow_seen) |
2873 { | |
2874 unsigned char *p = XSTRING (Voverlay_arrow_string)->data; | |
2875 int i; | |
2876 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
|
2877 int arrow_end; |
277 | 2878 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2879 if (len > width) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2880 len = width; |
9572 | 2881 #ifdef HAVE_FACES |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2882 if (!NULL_INTERVAL_P (XSTRING (Voverlay_arrow_string)->intervals)) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2883 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2884 /* If the arrow string has text props, obey them when displaying. */ |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2885 for (i = 0; i < len; i++) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2886 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2887 int c = p[i]; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2888 Lisp_Object face, ilisp; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2889 int newface; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2890 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2891 XSETFASTINT (ilisp, i); |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2892 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
|
2893 newface = compute_glyph_face_1 (f, face, 0); |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2894 leftmargin[i] = FAST_MAKE_GLYPH (c, newface); |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2895 } |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2896 } |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2897 else |
9572 | 2898 #endif /* HAVE_FACES */ |
8471
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2899 { |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2900 for (i = 0; i < len; i++) |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2901 leftmargin[i] = p[i]; |
64c299dd51b8
(display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents:
8417
diff
changeset
|
2902 } |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2903 |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2904 /* 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
|
2905 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
|
2906 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
|
2907 desired_glyphs->used[vpos] = arrow_end; |
277 | 2908 |
2909 overlay_arrow_seen = 1; | |
2910 } | |
2911 | |
2912 val.bufpos = pos; | |
2913 val_display_text_line = val; | |
2914 return &val_display_text_line; | |
2915 } | |
2916 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2917 /* 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
|
2918 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2919 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2920 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2921 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2922 { |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2923 Lisp_Object items, tail; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2924 register int vpos = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2925 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2926 int maxendcol = FRAME_WIDTH (f); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2927 int hpos = 0; |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2928 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2929 |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2930 #ifndef USE_X_TOOLKIT |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2931 if (FRAME_MENU_BAR_LINES (f) <= 0) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2932 return; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2933 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2934 get_display_line (f, vpos, 0); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2935 |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2936 items = FRAME_MENU_BAR_ITEMS (f); |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2937 for (i = 0; i < XVECTOR (items)->size; i += 3) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2938 { |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2939 Lisp_Object pos, string; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2940 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
|
2941 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2942 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
2943 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
2944 XSETFASTINT (XVECTOR (items)->contents[i + 2], hpos); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2945 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2946 if (hpos < maxendcol) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2947 hpos = display_string (XWINDOW (FRAME_ROOT_WINDOW (f)), vpos, |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2948 XSTRING (string)->data, |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2949 XSTRING (string)->size, |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2950 hpos, 0, 0, hpos, maxendcol); |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
2951 /* 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
|
2952 if (hpos < maxendcol) |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2953 { |
11065
da9137aa151f
(display_menu_bar): Just one space between menu items.
Richard M. Stallman <rms@gnu.org>
parents:
11011
diff
changeset
|
2954 int hpos1 = hpos + 1; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2955 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2956 min (hpos1, maxendcol), maxendcol); |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2957 } |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2958 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2959 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2960 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2961 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
|
2962 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2963 /* 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
|
2964 if (maxendcol > hpos) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
2965 hpos = display_string (w, vpos, "", 0, hpos, 0, 0, maxendcol, maxendcol); |
4423
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2966 |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2967 /* 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
|
2968 vpos++; |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2969 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
|
2970 get_display_line (f, vpos++, 0); |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
2971 #endif /* not USE_X_TOOLKIT */ |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2972 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2973 |
277 | 2974 /* Display the mode line for window w */ |
2975 | |
2976 static void | |
2977 display_mode_line (w) | |
2978 struct window *w; | |
2979 { | |
2980 register int vpos = XFASTINT (w->height) + XFASTINT (w->top) - 1; | |
2981 register int left = XFASTINT (w->left); | |
2982 register int right = XFASTINT (w->width) + left; | |
769 | 2983 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 2984 |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2985 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
|
2986 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2987 |
769 | 2988 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
|
2989 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
2990 /* 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
|
2991 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
|
2992 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
|
2993 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
|
2994 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
2995 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
|
2996 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
|
2997 |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
2998 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
2999 |
769 | 3000 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
277 | 3001 |
3002 /* Make the mode line inverse video if the entire line | |
3003 is made of mode lines. | |
3004 I.e. if this window is full width, | |
3005 or if it is the child of a full width window | |
3006 (which implies that that window is split side-by-side | |
3007 and the rest of this line is mode lines of the sibling windows). */ | |
769 | 3008 if (XFASTINT (w->width) == FRAME_WIDTH (f) |
3009 || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f)) | |
3010 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; | |
9572 | 3011 #ifdef HAVE_FACES |
11354
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
3012 else 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
|
3013 { |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3014 /* 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
|
3015 int i; |
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3016 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
|
3017 for (i = left; i < right; ++i) |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3018 ptr[i] = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (ptr[i]), 1); |
6278
ab5b9470fd85
(display_mode_line): Highlight partial-width mode lines
Richard M. Stallman <rms@gnu.org>
parents:
6134
diff
changeset
|
3019 } |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
3020 #endif |
277 | 3021 } |
3022 | |
3023 /* Contribute ELT to the mode line for window W. | |
3024 How it translates into text depends on its data type. | |
3025 | |
3026 VPOS is the position of the mode line being displayed. | |
3027 | |
769 | 3028 HPOS is the position (absolute on frame) where this element's text |
277 | 3029 should start. The output is truncated automatically at the right |
3030 edge of window W. | |
3031 | |
3032 DEPTH is the depth in recursion. It is used to prevent | |
3033 infinite recursion here. | |
3034 | |
3035 MINENDCOL is the hpos before which the element may not end. | |
3036 The element is padded at the right with spaces if nec | |
3037 to reach this column. | |
3038 | |
3039 MAXENDCOL is the hpos past which this element may not extend. | |
3040 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority. | |
3041 (This is necessary to make nested padding and truncation work.) | |
3042 | |
3043 Returns the hpos of the end of the text generated by ELT. | |
3044 The next element will receive that value as its HPOS arg, | |
3045 so as to concatenate the elements. */ | |
3046 | |
3047 static int | |
3048 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) | |
3049 struct window *w; | |
3050 register int vpos, hpos; | |
3051 int depth; | |
3052 int minendcol; | |
3053 register int maxendcol; | |
3054 register Lisp_Object elt; | |
3055 { | |
3056 tail_recurse: | |
3057 if (depth > 10) | |
3058 goto invalid; | |
3059 | |
3060 depth++; | |
3061 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
3062 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 3063 { |
3064 case Lisp_String: | |
3065 { | |
3066 /* A string: output it and check for %-constructs within it. */ | |
3067 register unsigned char c; | |
3068 register unsigned char *this = XSTRING (elt)->data; | |
3069 | |
3070 while (hpos < maxendcol && *this) | |
3071 { | |
3072 unsigned char *last = this; | |
3073 while ((c = *this++) != '\0' && c != '%') | |
3074 ; | |
3075 if (this - 1 != last) | |
3076 { | |
3077 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
|
3078 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3079 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
|
3080 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3081 hpos = display_string (w, vpos, last, -1, hpos, 0, 1, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3082 hpos, min (lim, maxendcol)); |
277 | 3083 } |
3084 else /* c == '%' */ | |
3085 { | |
3086 register int spec_width = 0; | |
3087 | |
3088 /* We can't allow -ve args due to the "%-" construct */ | |
3089 /* Argument specifies minwidth but not maxwidth | |
3090 (maxwidth can be specified by | |
3091 (<negative-number> . <stuff>) mode-line elements) */ | |
3092 | |
3093 while ((c = *this++) >= '0' && c <= '9') | |
3094 { | |
3095 spec_width = spec_width * 10 + (c - '0'); | |
3096 } | |
3097 | |
3098 spec_width += hpos; | |
3099 if (spec_width > maxendcol) | |
3100 spec_width = maxendcol; | |
3101 | |
3102 if (c == 'M') | |
3103 hpos = display_mode_element (w, vpos, hpos, depth, | |
3104 spec_width, maxendcol, | |
3105 Vglobal_mode_string); | |
3106 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
|
3107 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3108 char *spec = decode_mode_spec (w, c, maxendcol - hpos); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3109 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3110 hpos = store_frame_title (spec, spec_width, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3111 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3112 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
|
3113 hpos, 0, 1, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3114 spec_width, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3115 } |
277 | 3116 } |
3117 } | |
3118 } | |
3119 break; | |
3120 | |
3121 case Lisp_Symbol: | |
3122 /* A symbol: process the value of the symbol recursively | |
3123 as if it appeared here directly. Avoid error if symbol void. | |
3124 Special case: if value of symbol is a string, output the string | |
3125 literally. */ | |
3126 { | |
3127 register Lisp_Object tem; | |
3128 tem = Fboundp (elt); | |
485 | 3129 if (!NILP (tem)) |
277 | 3130 { |
3131 tem = Fsymbol_value (elt); | |
3132 /* If value is a string, output that string literally: | |
3133 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
|
3134 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3135 { |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3136 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3137 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
|
3138 minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3139 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3140 hpos = display_string (w, vpos, XSTRING (tem)->data, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3141 XSTRING (tem)->size, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3142 hpos, 0, 1, minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3143 } |
277 | 3144 /* Give up right away for nil or t. */ |
3145 else if (!EQ (tem, elt)) | |
3146 { elt = tem; goto tail_recurse; } | |
3147 } | |
3148 } | |
3149 break; | |
3150 | |
3151 case Lisp_Cons: | |
3152 { | |
3153 register Lisp_Object car, tem; | |
3154 | |
3155 /* A cons cell: three distinct cases. | |
3156 If first element is a string or a cons, process all the elements | |
3157 and effectively concatenate them. | |
3158 If first element is a negative number, truncate displaying cdr to | |
3159 at most that many characters. If positive, pad (with spaces) | |
3160 to at least that many characters. | |
3161 If first element is a symbol, process the cadr or caddr recursively | |
3162 according to whether the symbol's value is non-nil or nil. */ | |
3163 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
|
3164 if (SYMBOLP (car)) |
277 | 3165 { |
3166 tem = Fboundp (car); | |
3167 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
|
3168 if (!CONSP (elt)) |
277 | 3169 goto invalid; |
3170 /* elt is now the cdr, and we know it is a cons cell. | |
3171 Use its car if CAR has a non-nil value. */ | |
485 | 3172 if (!NILP (tem)) |
277 | 3173 { |
3174 tem = Fsymbol_value (car); | |
485 | 3175 if (!NILP (tem)) |
277 | 3176 { elt = XCONS (elt)->car; goto tail_recurse; } |
3177 } | |
3178 /* Symbol's value is nil (or symbol is unbound) | |
3179 Get the cddr of the original list | |
3180 and if possible find the caddr and use that. */ | |
3181 elt = XCONS (elt)->cdr; | |
485 | 3182 if (NILP (elt)) |
277 | 3183 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3184 else if (!CONSP (elt)) |
277 | 3185 goto invalid; |
3186 elt = XCONS (elt)->car; | |
3187 goto tail_recurse; | |
3188 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3189 else if (INTEGERP (car)) |
277 | 3190 { |
3191 register int lim = XINT (car); | |
3192 elt = XCONS (elt)->cdr; | |
3193 if (lim < 0) | |
3194 /* Negative int means reduce maximum width. | |
3195 DO NOT change MINENDCOL here! | |
3196 (20 -10 . foo) should truncate foo to 10 col | |
3197 and then pad to 20. */ | |
3198 maxendcol = min (maxendcol, hpos - lim); | |
3199 else if (lim > 0) | |
3200 { | |
3201 /* Padding specified. Don't let it be more than | |
3202 current maximum. */ | |
3203 lim += hpos; | |
3204 if (lim > maxendcol) | |
3205 lim = maxendcol; | |
3206 /* If that's more padding than already wanted, queue it. | |
3207 But don't reduce padding already specified even if | |
3208 that is beyond the current truncation point. */ | |
3209 if (lim > minendcol) | |
3210 minendcol = lim; | |
3211 } | |
3212 goto tail_recurse; | |
3213 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3214 else if (STRINGP (car) || CONSP (car)) |
277 | 3215 { |
3216 register int limit = 50; | |
3217 /* 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
|
3218 while (CONSP (elt) && --limit > 0 |
277 | 3219 && hpos < maxendcol) |
3220 { | |
3221 hpos = display_mode_element (w, vpos, hpos, depth, | |
3222 hpos, maxendcol, | |
3223 XCONS (elt)->car); | |
3224 elt = XCONS (elt)->cdr; | |
3225 } | |
3226 } | |
3227 } | |
3228 break; | |
3229 | |
3230 default: | |
3231 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3232 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3233 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
|
3234 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3235 hpos = display_string (w, vpos, "*invalid*", -1, hpos, 0, 1, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3236 minendcol, maxendcol); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3237 return hpos; |
277 | 3238 } |
3239 | |
3240 if (minendcol > hpos) | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3241 if (frame_title_ptr) |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3242 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
|
3243 else |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3244 hpos = display_string (w, vpos, "", 0, hpos, 0, 1, minendcol, maxendcol); |
277 | 3245 return hpos; |
3246 } | |
3247 | |
3248 /* Return a string for the output of a mode line %-spec for window W, | |
3249 generated by character C and width MAXWIDTH. */ | |
3250 | |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
3251 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
|
3252 |
277 | 3253 static char * |
3254 decode_mode_spec (w, c, maxwidth) | |
3255 struct window *w; | |
3256 register char c; | |
3257 register int maxwidth; | |
3258 { | |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
3259 Lisp_Object obj; |
769 | 3260 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
3261 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
|
3262 struct buffer *b = XBUFFER (w->buffer); |
277 | 3263 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
3264 obj = Qnil; |
769 | 3265 if (maxwidth > FRAME_WIDTH (f)) |
3266 maxwidth = FRAME_WIDTH (f); | |
277 | 3267 |
3268 switch (c) | |
3269 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3270 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3271 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
|
3272 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3273 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
|
3274 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3275 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3276 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3277 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3278 /* 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
|
3279 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
|
3280 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3281 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
|
3282 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3283 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3284 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3285 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3286 /* 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
|
3287 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
|
3288 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3289 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3290 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3291 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3292 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3293 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3294 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3295 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3296 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3297 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3298 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3299 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
|
3300 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3301 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
|
3302 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
|
3303 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3304 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3305 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
|
3306 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3307 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3308 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3309 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3310 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3311 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3312 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3313 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
|
3314 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3315 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
|
3316 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
|
3317 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3318 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3319 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
|
3320 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3321 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3322 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3323 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3324 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
|
3325 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
|
3326 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3327 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
|
3328 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
|
3329 else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3330 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3331 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
|
3332 *p++ = '-'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3333 *p = '\0'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3334 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3335 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
|
3336 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3337 |
277 | 3338 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3339 obj = b->name; |
277 | 3340 #if 0 |
3341 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth) | |
3342 { | |
3343 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1); | |
3344 decode_mode_spec_buf[maxwidth - 1] = '\\'; | |
3345 decode_mode_spec_buf[maxwidth] = '\0'; | |
3346 return decode_mode_spec_buf; | |
3347 } | |
3348 #endif | |
3349 break; | |
3350 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3351 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3352 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3353 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
|
3354 XSETFASTINT (w->column_number_displayed, col); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3355 sprintf (decode_mode_spec_buf, "%d", col); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3356 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
|
3357 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3358 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3359 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3360 /* %F displays the frame name. */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3361 return (char *) XSTRING (selected_frame->name)->data; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3362 |
277 | 3363 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3364 obj = b->filename; |
277 | 3365 #if 0 |
485 | 3366 if (NILP (obj)) |
277 | 3367 return "[none]"; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3368 else if (STRINGP (obj) && XSTRING (obj)->size > maxwidth) |
277 | 3369 { |
3370 bcopy ("...", decode_mode_spec_buf, 3); | |
3371 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3, | |
3372 decode_mode_spec_buf + 3, maxwidth - 3); | |
3373 return decode_mode_spec_buf; | |
3374 } | |
3375 #endif | |
3376 break; | |
3377 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3378 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3379 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3380 int startpos = marker_position (w->start); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3381 int line, linepos, topline; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3382 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3383 Lisp_Object tem; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3384 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3385 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3386 /* 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
|
3387 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3388 if (EQ (w->base_line_pos, w->buffer)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3389 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3390 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3391 /* 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
|
3392 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
|
3393 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3394 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3395 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3396 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3397 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3398 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3399 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3400 && !NILP (w->base_line_pos) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3401 && XFASTINT (w->base_line_pos) <= marker_position (w->start)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3402 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3403 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3404 linepos = XFASTINT (w->base_line_pos); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3405 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3406 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3407 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3408 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3409 linepos = BUF_BEGV (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3410 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3411 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3412 /* Count lines from base line to window start position. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3413 nlines = display_count_lines (linepos, startpos, startpos, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3414 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3415 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3416 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3417 /* 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
|
3418 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
|
3419 "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
|
3420 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
|
3421 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3422 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3423 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
|
3424 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
|
3425 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3426 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
|
3427 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3428 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3429 int limit = BUF_BEGV (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3430 int position; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3431 int distance = (height * 2 + 30) * 200; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3432 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3433 if (startpos - distance > limit) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3434 limit = startpos - distance; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3435 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3436 nlines = display_count_lines (startpos, limit, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3437 -(height * 2 + 30), |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3438 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3439 /* 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
|
3440 200 chars per line, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3441 give up on line numbers for this window. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3442 if (position == startpos - distance) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3443 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3444 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3445 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3446 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3447 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3448 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3449 XSETFASTINT (w->base_line_number, topline - nlines); |
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
3450 XSETFASTINT (w->base_line_pos, position); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3451 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3452 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3453 /* Now count lines from the start pos to point. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3454 nlines = display_count_lines (startpos, PT, PT, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3455 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3456 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3457 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3458 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3459 /* Make the string to show. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3460 sprintf (decode_mode_spec_buf, "%d", topline + nlines); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3461 return decode_mode_spec_buf; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3462 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3463 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3464 |
277 | 3465 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3466 obj = b->mode_name; |
277 | 3467 break; |
3468 | |
3469 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3470 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 3471 return " Narrow"; |
3472 break; | |
3473 | |
3474 case 'p': | |
3475 { | |
3476 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
|
3477 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
|
3478 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3479 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 3480 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3481 if (pos <= BUF_BEGV (b)) |
277 | 3482 return "All"; |
3483 else | |
3484 return "Bottom"; | |
3485 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3486 else if (pos <= BUF_BEGV (b)) |
277 | 3487 return "Top"; |
3488 else | |
3489 { | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3490 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 3491 /* We can't normally display a 3-digit number, |
3492 so get us a 2-digit number that is close. */ | |
3493 if (total == 100) | |
3494 total = 99; | |
3495 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
3496 return decode_mode_spec_buf; | |
3497 } | |
3498 } | |
3499 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3500 /* 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
|
3501 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3502 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3503 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
|
3504 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
|
3505 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
|
3506 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3507 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3508 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3509 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3510 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3511 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3512 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3513 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3514 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3515 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3516 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
|
3517 /* 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
|
3518 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
|
3519 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3520 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3521 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3522 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3523 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3524 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3525 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3526 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3527 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
3528 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3529 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3530 /* 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
|
3531 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
|
3532 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
|
3533 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
|
3534 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3535 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
|
3536 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3537 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3538 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3539 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
|
3540 #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
|
3541 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
|
3542 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3543 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
3544 #endif |
277 | 3545 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3546 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3547 if (STRINGP (obj)) |
277 | 3548 return (char *) XSTRING (obj)->data; |
3549 else | |
3550 return ""; | |
3551 } | |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3552 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3553 /* Search for COUNT instances of a line boundary, which means either a |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3554 newline or (if selective display enabled) a carriage return. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3555 Start at START. If COUNT is negative, search backwards. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3556 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3557 If we find COUNT instances, set *SHORTAGE to zero, and return the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3558 position after the COUNTth match. Note that for reverse motion |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3559 this is not the same as the usual convention for Emacs motion commands. |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3560 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3561 If we don't find COUNT instances before reaching the end of the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3562 buffer (or the beginning, if scanning backwards), set *SHORTAGE to |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3563 the number of line boundaries left unfound, and return the end of the |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3564 buffer we bumped up against. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3565 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3566 static int |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3567 display_scan_buffer (start, count, shortage) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3568 int *shortage, start; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3569 register int count; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3570 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3571 int limit = ((count > 0) ? ZV - 1 : BEGV); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3572 int direction = ((count > 0) ? 1 : -1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3573 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3574 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3575 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3576 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3577 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3578 register unsigned char *ceiling_addr; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3579 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3580 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3581 check only for newlines. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3582 if (! (!NILP (current_buffer->selective_display) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3583 && !INTEGERP (current_buffer->selective_display))) |
9451
bdad001a9b91
(display_scan_buffer): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
9420
diff
changeset
|
3584 return scan_buffer ('\n', start, 0, count, shortage, 0); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3585 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3586 /* The code that follows is like scan_buffer |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3587 but checks for either newline or carriage return. */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3588 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3589 if (shortage != 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3590 *shortage = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3591 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3592 if (count > 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3593 while (start != limit + 1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3594 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3595 ceiling = BUFFER_CEILING_OF (start); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3596 ceiling = min (limit, ceiling); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3597 ceiling_addr = &FETCH_CHAR (ceiling) + 1; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3598 base = (cursor = &FETCH_CHAR (start)); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3599 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3600 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3601 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3602 ; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3603 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3604 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3605 if (--count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3606 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3607 immediate_quit = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3608 return (start + cursor - base + 1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3609 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3610 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3611 if (++cursor == ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3612 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3613 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3614 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3615 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3616 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3617 start += cursor - base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3618 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3619 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3620 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3621 start--; /* first character we scan */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3622 while (start > limit - 1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3623 { /* we WILL scan under start */ |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3624 ceiling = BUFFER_FLOOR_OF (start); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3625 ceiling = max (limit, ceiling); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3626 ceiling_addr = &FETCH_CHAR (ceiling) - 1; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3627 base = (cursor = &FETCH_CHAR (start)); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3628 cursor++; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3629 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3630 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3631 while (--cursor != ceiling_addr |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3632 && *cursor != '\n' && *cursor != 015) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3633 ; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3634 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3635 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3636 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3637 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3638 immediate_quit = 0; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3639 return (start + cursor - base + 1); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3640 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3641 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3642 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3643 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3644 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3645 start += cursor - base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3646 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3647 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3648 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3649 if (shortage != 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3650 *shortage = count * direction; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3651 return (start + ((direction == 1 ? 0 : 1))); |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3652 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3653 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3654 /* Count up to N lines starting from FROM. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3655 But don't go beyond LIMIT. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3656 Return the number of lines thus found (always positive). |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3657 Store the position after what was found into *POS_PTR. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3658 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3659 static int |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3660 display_count_lines (from, limit, n, pos_ptr) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3661 int from, limit, n; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3662 int *pos_ptr; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3663 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3664 int oldbegv = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3665 int oldzv = ZV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3666 int shortage = 0; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3667 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3668 if (limit < from) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3669 BEGV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3670 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3671 ZV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3672 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
3673 *pos_ptr = display_scan_buffer (from, n, &shortage); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3674 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3675 ZV = oldzv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3676 BEGV = oldbegv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3677 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3678 if (n < 0) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3679 /* When scanning backwards, scan_buffer stops *after* the last newline |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3680 it finds, but does count it. Compensate for that. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3681 return - n - shortage - (*pos_ptr != limit); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3682 return n - shortage; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3683 } |
277 | 3684 |
3685 /* Display STRING on one line of window W, starting at HPOS. | |
3686 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
|
3687 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
|
3688 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated. |
277 | 3689 |
3690 TRUNCATE is GLYPH to display at end if truncated. Zero for none. | |
3691 | |
3692 MINCOL is the first column ok to end at. (Pad with spaces to this col.) | |
3693 MAXCOL is the last column ok to end at. Truncate here. | |
3694 -1 for MINCOL or MAXCOL means no explicit minimum or maximum. | |
769 | 3695 Both count from the left edge of the frame, as does HPOS. |
277 | 3696 The right edge of W is an implicit maximum. |
3697 If TRUNCATE is nonzero, the implicit maximum is one column before the edge. | |
3698 | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3699 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
|
3700 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
|
3701 and not display anything beyond there. Otherwise, only MAXCOL |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3702 controls where to stop output. |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3703 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3704 Returns ending hpos. */ |
277 | 3705 |
3706 static int | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3707 display_string (w, vpos, string, length, hpos, truncate, |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3708 obey_window_width, mincol, maxcol) |
277 | 3709 struct window *w; |
3710 unsigned char *string; | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3711 int length; |
277 | 3712 int vpos, hpos; |
3713 GLYPH truncate; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3714 int obey_window_width; |
277 | 3715 int mincol, maxcol; |
3716 { | |
3717 register int c; | |
3718 register GLYPH *p1; | |
3719 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
|
3720 int tab_width = XINT (XBUFFER (w->buffer)->tab_width); |
277 | 3721 register GLYPH *start; |
3722 register GLYPH *end; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3723 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
|
3724 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 3725 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos; |
3726 int window_width = XFASTINT (w->width); | |
3727 | |
3728 /* Use the standard display table, not the window's display table. | |
3729 We don't want the mode line in rot13. */ | |
3730 register struct Lisp_Vector *dp = 0; | |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3731 int i; |
277 | 3732 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3733 if (VECTORP (Vstandard_display_table) |
277 | 3734 && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE) |
3735 dp = XVECTOR (Vstandard_display_table); | |
3736 | |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
3737 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 3738 |
3739 p1 = p1start; | |
3740 start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left); | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3741 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3742 if (obey_window_width) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3743 { |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3744 end = start + window_width - (truncate != 0); |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3745 |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3746 if ((window_width + XFASTINT (w->left)) != FRAME_WIDTH (f)) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3747 { |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3748 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3749 { |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3750 int i; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3751 |
8943
a9e40d478857
(display_string): Change VERTICAL_SCROLL_BAR_WIDTH to FRAME_SCROLL_BAR_COLS.
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
3752 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
|
3753 *end-- = ' '; |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3754 } |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3755 else |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3756 *end-- = '|'; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3757 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
3758 } |
277 | 3759 |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3760 if (! obey_window_width |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3761 || (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol)) |
277 | 3762 end = desired_glyphs->glyphs[vpos] + maxcol; |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3763 |
6612
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3764 /* 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
|
3765 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
|
3766 desired_glyphs->charstarts[vpos][i] = 0; |
1462bf31ef3c
(redisplay): Call frame_up_to_date_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6568
diff
changeset
|
3767 |
277 | 3768 if (maxcol >= 0 && mincol > maxcol) |
3769 mincol = maxcol; | |
3770 | |
3771 while (p1 < end) | |
3772 { | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3773 if (length == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3774 break; |
277 | 3775 c = *string++; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3776 /* Specified length. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3777 if (length >= 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3778 length--; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3779 /* Unspecified length (null-terminated string). */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3780 else if (c == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3781 break; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3782 |
10822
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3783 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
|
3784 { |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3785 p1 = copy_part_of_rope (f, p1, start, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3786 XVECTOR (DISP_CHAR_VECTOR (dp, c))->contents, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3787 XVECTOR (DISP_CHAR_VECTOR (dp, c))->size, |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3788 0); |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3789 } |
1ec15b8745a2
(display_string, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
10769
diff
changeset
|
3790 else if (c >= 040 && c < 0177) |
277 | 3791 { |
3792 if (p1 >= start) | |
3793 *p1 = c; | |
3794 p1++; | |
3795 } | |
3796 else if (c == '\t') | |
3797 { | |
3798 do | |
3799 { | |
3800 if (p1 >= start && p1 < end) | |
3801 *p1 = SPACEGLYPH; | |
3802 p1++; | |
3803 } | |
3804 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width); | |
3805 } | |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
3806 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow)) |
277 | 3807 { |
3808 if (p1 >= start) | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3809 *p1 = fix_glyph (f, (dp && INTEGERP (DISP_CTRL_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3810 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3811 0); |
277 | 3812 p1++; |
368 | 3813 if (p1 >= start && p1 < end) |
277 | 3814 *p1 = c ^ 0100; |
3815 p1++; | |
3816 } | |
3817 else | |
3818 { | |
3819 if (p1 >= start) | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
3820 *p1 = fix_glyph (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3821 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3822 0); |
277 | 3823 p1++; |
368 | 3824 if (p1 >= start && p1 < end) |
277 | 3825 *p1 = (c >> 6) + '0'; |
3826 p1++; | |
368 | 3827 if (p1 >= start && p1 < end) |
277 | 3828 *p1 = (7 & (c >> 3)) + '0'; |
3829 p1++; | |
368 | 3830 if (p1 >= start && p1 < end) |
277 | 3831 *p1 = (7 & c) + '0'; |
3832 p1++; | |
3833 } | |
3834 } | |
3835 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3836 if (c && length > 0) |
277 | 3837 { |
3838 p1 = end; | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
3839 if (truncate) *p1++ = fix_glyph (f, truncate, 0); |
277 | 3840 } |
3841 else if (mincol >= 0) | |
3842 { | |
3843 end = desired_glyphs->glyphs[vpos] + mincol; | |
3844 while (p1 < end) | |
3845 *p1++ = SPACEGLYPH; | |
3846 } | |
3847 | |
3848 { | |
3849 register int len = p1 - desired_glyphs->glyphs[vpos]; | |
3850 | |
3851 if (len > desired_glyphs->used[vpos]) | |
3852 desired_glyphs->used[vpos] = len; | |
3853 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
3854 | |
3855 return len; | |
3856 } | |
3857 } | |
3858 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3859 /* 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
|
3860 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
|
3861 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
|
3862 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
|
3863 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
|
3864 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3865 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3866 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3867 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3868 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3869 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3870 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3871 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3872 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3873 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
|
3874 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3875 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3876 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3877 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3878 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3879 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
|
3880 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3881 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3882 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3883 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3884 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3885 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3886 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3887 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3888 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
|
3889 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3890 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3891 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3892 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3893 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3894 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
|
3895 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3896 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3897 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3898 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3899 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3900 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3901 /* 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
|
3902 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
|
3903 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
|
3904 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
|
3905 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
|
3906 Otherwise return 0. |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3907 This function cannot quit. */ |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3908 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3909 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3910 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3911 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3912 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3913 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3914 register Lisp_Object tail, proptail; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3915 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
|
3916 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3917 register Lisp_Object tem; |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3918 tem = XCONS (tail)->car; |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3919 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
|
3920 return ! NILP (XCONS (tem)->cdr); |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3921 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3922 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3923 for (proptail = propval; CONSP (proptail); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3924 proptail = XCONS (proptail)->cdr) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3925 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3926 Lisp_Object propelt; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3927 propelt = XCONS (proptail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3928 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
|
3929 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3930 register Lisp_Object tem; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3931 tem = XCONS (tail)->car; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3932 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
|
3933 return ! NILP (XCONS (tem)->cdr); |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3934 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
3935 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3936 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3937 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
3938 |
277 | 3939 void |
3940 syms_of_xdisp () | |
3941 { | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
3942 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
|
3943 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
|
3944 |
277 | 3945 staticpro (&last_arrow_position); |
3946 staticpro (&last_arrow_string); | |
3947 last_arrow_position = Qnil; | |
3948 last_arrow_string = Qnil; | |
3949 | |
3950 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, | |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
3951 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 3952 Vglobal_mode_string = Qnil; |
3953 | |
3954 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
3955 "Marker for where to display an arrow on top of the buffer text.\n\ | |
3956 This must be the beginning of a line in order to work.\n\ | |
3957 See also `overlay-arrow-string'."); | |
3958 Voverlay_arrow_position = Qnil; | |
3959 | |
3960 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
3961 "String to display as an arrow. See also `overlay-arrow-position'."); | |
3962 Voverlay_arrow_string = Qnil; | |
3963 | |
3964 DEFVAR_INT ("scroll-step", &scroll_step, | |
3965 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 3966 If that fails to bring point back on frame, point is centered instead.\n\ |
3967 If this is zero, point is always centered after it moves off frame."); | |
277 | 3968 |
3969 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); | |
3970 | |
3971 DEFVAR_BOOL ("truncate-partial-width-windows", | |
3972 &truncate_partial_width_windows, | |
769 | 3973 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 3974 truncate_partial_width_windows = 1; |
3975 | |
3976 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
3977 "*Non-nil means use inverse video for the mode line."); | |
3978 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3979 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3980 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3981 "*Maximum buffer size for which line number should be displayed."); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3982 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
|
3983 |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
3984 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
|
3985 "*Non-nil means highlight 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
|
3986 highlight_nonselected_windows = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3987 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3988 DEFVAR_BOOL ("multiple-frames", &multiple_frames, |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3989 "Non-nil means more than one frame is in use, not counting minibuffer frames.\n\ |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3990 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
|
3991 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3992 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
|
3993 "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
|
3994 \(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
|
3995 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
|
3996 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
|
3997 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
3998 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
|
3999 "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
|
4000 \(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
|
4001 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
|
4002 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
|
4003 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4004 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4005 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4006 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4007 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4008 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4009 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4010 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4011 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4012 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
4013 Qnil))); |
10393 | 4014 |
4015 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
4016 "Maximum number of lines to keep in the message log buffer.\n\ | |
4017 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
4018 the buffer when it becomes large."); | |
4019 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
4020 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
4021 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
|
4022 "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
|
4023 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
|
4024 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
|
4025 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
|
4026 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
|
4027 Vwindow_size_change_functions = Qnil; |
277 | 4028 } |
4029 | |
4030 /* initialize the window system */ | |
4031 init_xdisp () | |
4032 { | |
4033 Lisp_Object root_window; | |
4034 #ifndef COMPILER_REGISTER_BUG | |
4035 register | |
4036 #endif /* COMPILER_REGISTER_BUG */ | |
4037 struct window *mini_w; | |
4038 | |
4039 this_line_bufpos = 0; | |
4040 | |
4041 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
|
4042 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 4043 |
4044 echo_area_glyphs = 0; | |
4045 previous_echo_glyphs = 0; | |
4046 | |
4047 if (!noninteractive) | |
4048 { | |
769 | 4049 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4050 XSETFASTINT (XWINDOW (root_window)->top, 0); |
769 | 4051 set_window_height (root_window, FRAME_HEIGHT (f) - 1, 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4052 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 4053 set_window_height (minibuf_window, 1, 0); |
4054 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
4055 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
|
4056 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
277 | 4057 } |
4058 } |