Mercurial > emacs
annotate src/xdisp.c @ 5496:24f0d2908e61
[MSDOS]: Use text mode for all files but ".elc" files.
(complete_file_name) [MSDOS]: Drive letter support.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 08 Jan 1994 09:17:27 +0000 |
parents | fcd6e0da3380 |
children | 4e3a6baa4750 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993 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 |
38 extern int interrupt_input; | |
39 extern int command_loop_level; | |
40 | |
41 /* Nonzero means print newline before next minibuffer message. */ | |
42 | |
43 int noninteractive_need_newline; | |
44 | |
45 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
46 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
47 | |
48 /* The buffer position of the first character appearing | |
769 | 49 entirely or partially on the current frame line. |
50 Or zero, which disables the optimization for the current frame line. */ | |
277 | 51 static int this_line_bufpos; |
52 | |
53 /* Number of characters past the end of this line, | |
54 including the terminating newline */ | |
55 static int this_line_endpos; | |
56 | |
769 | 57 /* The vertical position of this frame line. */ |
277 | 58 static int this_line_vpos; |
59 | |
769 | 60 /* Hpos value for start of display on this frame line. |
277 | 61 Usually zero, but negative if first character really began |
62 on previous line */ | |
63 static int this_line_start_hpos; | |
64 | |
65 /* Buffer that this_line variables are describing. */ | |
66 static struct buffer *this_line_buffer; | |
67 | |
68 /* Set by try_window_id to the vpos of first of any lines | |
769 | 69 scrolled on to the bottom of the frame. These lines should |
277 | 70 not be included in any general scroll computation. */ |
71 static int scroll_bottom_vpos; | |
72 | |
73 /* Value of echo_area_glyphs when it was last acted on. | |
769 | 74 If this is nonzero, there is a message on the frame |
277 | 75 in the minibuffer and it should be erased as soon |
76 as it is no longer requested to appear. */ | |
77 char *previous_echo_glyphs; | |
78 | |
769 | 79 /* Nonzero means truncate lines in all windows less wide than the frame */ |
277 | 80 int truncate_partial_width_windows; |
81 | |
82 Lisp_Object Vglobal_mode_string; | |
83 | |
84 /* Marker for where to display an arrow on top of the buffer text. */ | |
85 Lisp_Object Voverlay_arrow_position; | |
86 | |
87 /* String to display for the arrow. */ | |
88 Lisp_Object Voverlay_arrow_string; | |
89 | |
90 /* 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
|
91 static Lisp_Object last_arrow_position, last_arrow_string; |
277 | 92 |
93 /* Nonzero if overlay arrow has been displayed once in this window. */ | |
94 static int overlay_arrow_seen; | |
95 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
96 /* 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
|
97 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
|
98 |
769 | 99 /* If cursor motion alone moves point off frame, |
277 | 100 Try scrolling this many lines up or down if that will bring it back. */ |
101 int scroll_step; | |
102 | |
103 /* Nonzero if try_window_id has made blank lines at window bottom | |
104 since the last redisplay that paused */ | |
105 static int blank_end_of_window; | |
106 | |
107 /* Number of windows showing the buffer of the selected window. | |
108 keyboard.c refers to this. */ | |
109 int buffer_shared; | |
110 | |
769 | 111 /* display_text_line sets these to the frame position (origin 0) of point, |
277 | 112 whether the window is selected or not. |
113 Set one to -1 first to determine whether point was found afterwards. */ | |
114 | |
115 static int cursor_vpos; | |
116 static int cursor_hpos; | |
117 | |
118 int debug_end_pos; | |
119 | |
120 /* Nonzero means display mode line highlighted */ | |
121 int mode_line_inverse_video; | |
122 | |
123 static void echo_area_display (); | |
124 void mark_window_display_accurate (); | |
125 static void redisplay_windows (); | |
126 static void redisplay_window (); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
127 static void update_menu_bars (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
128 static void update_menu_bar (); |
277 | 129 static void try_window (); |
130 static int try_window_id (); | |
131 static struct position *display_text_line (); | |
132 static void display_mode_line (); | |
133 static int display_mode_element (); | |
134 static char *fmodetrunc (); | |
135 static char *decode_mode_spec (); | |
136 static int display_string (); | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
137 static void display_menu_bar (); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
138 static int display_count_lines (); |
277 | 139 |
140 /* Prompt to display in front of the minibuffer contents */ | |
141 char *minibuf_prompt; | |
142 | |
143 /* Width in columns of current minibuffer prompt. */ | |
144 int minibuf_prompt_width; | |
145 | |
146 /* Message to display instead of minibuffer contents | |
147 This is what the functions error and message make, | |
148 and command echoing uses it as well. | |
149 It overrides the minibuf_prompt as well as the buffer. */ | |
150 char *echo_area_glyphs; | |
151 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
152 /* 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
|
153 int echo_area_glyphs_length; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
154 |
277 | 155 /* true iff we should redraw the mode lines on the next redisplay */ |
156 int update_mode_lines; | |
157 | |
158 /* Smallest number of characters before the gap | |
159 at any time since last redisplay that finished. | |
160 Valid for current buffer when try_window_id can be called. */ | |
161 int beg_unchanged; | |
162 | |
163 /* Smallest number of characters after the gap | |
164 at any time since last redisplay that finished. | |
165 Valid for current buffer when try_window_id can be called. */ | |
166 int end_unchanged; | |
167 | |
168 /* MODIFF as of last redisplay that finished; | |
169 if it matches MODIFF, beg_unchanged and end_unchanged | |
170 contain no useful information */ | |
171 int unchanged_modified; | |
172 | |
173 /* Nonzero if head_clip or tail_clip of current buffer has changed | |
174 since last redisplay that finished */ | |
175 int clip_changed; | |
176 | |
177 /* Nonzero if window sizes or contents have changed | |
178 since last redisplay that finished */ | |
179 int windows_or_buffers_changed; | |
180 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
181 /* 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
|
182 and it displayed a line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
183 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
184 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
185 /* Maximum buffer size for which to display line numbers. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
186 int line_number_display_limit; |
277 | 187 |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
188 /* Specify m, a string, as a message in the minibuf. If m is 0, clear out |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
189 any existing message, and let the minibuffer text show through. */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
190 |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
191 void |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
192 message1 (m) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
193 char *m; |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
194 { |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
195 if (noninteractive) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
196 { |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
197 if (noninteractive_need_newline) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
198 putc ('\n', stderr); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
199 noninteractive_need_newline = 0; |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
200 if (cursor_in_echo_area != 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
201 fprintf (stderr, "%s", m); |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
202 else |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
203 fprintf (stderr, "%s\n", m); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
204 fflush (stderr); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
205 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
206 /* A null message buffer means that the frame hasn't really been |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
207 initialized yet. Error messages get reported properly by |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
208 cmd_error, so this must be just an informative message; toss it. */ |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
209 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
210 { |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
211 #ifdef MULTI_FRAME |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
212 Lisp_Object minibuf_frame; |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
213 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
214 choose_minibuf_frame (); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
215 minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
216 FRAME_SAMPLE_VISIBILITY (XFRAME (minibuf_frame)); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
217 if (FRAME_VISIBLE_P (selected_frame) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
218 && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame))) |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
219 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
220 #endif |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
221 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
222 if (m) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
223 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
224 echo_area_glyphs = m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
225 echo_area_glyphs_length = strlen (m); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
226 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
227 else |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
228 echo_area_glyphs = previous_echo_glyphs = 0; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
229 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
230 do_pending_window_change (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
231 echo_area_display (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
232 update_frame (XFRAME (XWINDOW (minibuf_window)->frame), 1, 1); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
233 do_pending_window_change (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
234 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
235 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
236 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
237 /* Display an echo area message M with a specified length of LEN chars. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
238 This way, null characters can be included. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
239 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
240 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
241 message2 (m, len) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
242 char *m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
243 int len; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
244 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
245 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
246 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
247 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
248 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
249 noninteractive_need_newline = 0; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
250 fwrite (m, len, 1, stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
251 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
252 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
253 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
254 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
255 /* 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
|
256 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
257 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
|
258 else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
259 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
260 #ifdef MULTI_FRAME |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
261 Lisp_Object minibuf_frame; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
262 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
263 choose_minibuf_frame (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
264 minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
265 FRAME_SAMPLE_VISIBILITY (XFRAME (minibuf_frame)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
266 if (FRAME_VISIBLE_P (selected_frame) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
267 && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame))) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
268 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
269 #endif |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
270 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
271 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
272 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
273 echo_area_glyphs = m; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
274 echo_area_glyphs_length = len; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
275 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
276 else |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
277 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
|
278 |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
279 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
|
280 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
|
281 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
|
282 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
|
283 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
284 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
285 |
769 | 286 /* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print; |
331 | 287 zero if being used by message. */ |
288 int message_buf_print; | |
289 | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
290 /* 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
|
291 any existing message, and let the minibuffer text show through. */ |
277 | 292 /* VARARGS 1 */ |
293 void | |
294 message (m, a1, a2, a3) | |
295 char *m; | |
296 { | |
297 if (noninteractive) | |
298 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
299 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
300 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
301 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
|
302 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
|
303 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
|
304 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
305 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
306 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
|
307 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
308 } |
277 | 309 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
310 else if (INTERACTIVE) |
277 | 311 { |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
312 /* 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
|
313 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
|
314 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
|
315 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
|
316 #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
|
317 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
|
318 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
|
319 #else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
320 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
|
321 #endif |
277 | 322 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
323 /* 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
|
324 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
|
325 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
|
326 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
|
327 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
328 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
329 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
330 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
|
331 #ifdef NO_ARG_ARRAY |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
332 int a[3]; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
333 a[0] = a1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
334 a[1] = a2; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
335 a[2] = a3; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
336 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
337 len = doprnt (FRAME_MESSAGE_BUF (echo_frame), |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
338 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
|
339 #else |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
340 len = doprnt (FRAME_MESSAGE_BUF (echo_frame), |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
341 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
|
342 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
343 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
344 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
|
345 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
346 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
347 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
348 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
349 /* 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
|
350 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
|
351 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
|
352 } |
277 | 353 } |
354 } | |
355 | |
356 static void | |
357 echo_area_display () | |
358 { | |
359 register int vpos; | |
769 | 360 FRAME_PTR f; |
277 | 361 |
769 | 362 #ifdef MULTI_FRAME |
363 choose_minibuf_frame (); | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
364 #endif |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
365 |
769 | 366 f = XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); |
277 | 367 |
769 | 368 if (! FRAME_VISIBLE_P (f)) |
277 | 369 return; |
370 | |
769 | 371 if (frame_garbaged) |
277 | 372 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
373 redraw_garbaged_frames (); |
769 | 374 frame_garbaged = 0; |
277 | 375 } |
376 | |
377 if (echo_area_glyphs || minibuf_level == 0) | |
378 { | |
379 vpos = XFASTINT (XWINDOW (minibuf_window)->top); | |
769 | 380 get_display_line (f, vpos, 0); |
277 | 381 display_string (XWINDOW (minibuf_window), vpos, |
382 echo_area_glyphs ? echo_area_glyphs : "", | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
383 echo_area_glyphs ? echo_area_glyphs_length : -1, |
769 | 384 0, 0, 0, FRAME_WIDTH (f)); |
277 | 385 |
386 /* If desired cursor location is on this line, put it at end of text */ | |
769 | 387 if (FRAME_CURSOR_Y (f) == vpos) |
388 FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; | |
727 | 389 |
390 /* Fill the rest of the minibuffer window with blank lines. */ | |
391 { | |
392 int i; | |
393 | |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
394 for (i = vpos + 1; |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
395 i < vpos + XFASTINT (XWINDOW (minibuf_window)->height); i++) |
727 | 396 { |
769 | 397 get_display_line (f, i, 0); |
727 | 398 display_string (XWINDOW (minibuf_window), vpos, |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
399 "", 0, 0, 0, 0, FRAME_WIDTH (f)); |
727 | 400 } |
401 } | |
277 | 402 } |
403 else if (!EQ (minibuf_window, selected_window)) | |
404 windows_or_buffers_changed++; | |
405 | |
406 if (EQ (minibuf_window, selected_window)) | |
407 this_line_bufpos = 0; | |
408 | |
409 previous_echo_glyphs = echo_area_glyphs; | |
410 } | |
411 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
412 /* Prepare for redisplay by updating menu-bar item lists when appropriate. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
413 This can't be done in `redisplay' itself because it can call eval. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
414 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
415 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
416 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
417 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
418 register struct window *w = XWINDOW (selected_window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
419 int all_windows; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
420 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
421 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
422 return; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
423 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
424 /* Set the visible flags for all frames. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
425 Do this before checking for resized or garbaged frames; they want |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
426 to know if their frames are visible. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
427 See the comment in frame.h for FRAME_SAMPLE_VISIBILITY. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
428 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
429 Lisp_Object tail, frame; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
430 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
431 FOR_EACH_FRAME (tail, frame) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
432 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
433 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
434 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
435 /* Notice any pending interrupt request to change frame size. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
436 do_pending_window_change (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
437 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
438 if (frame_garbaged) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
439 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
440 redraw_garbaged_frames (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
441 frame_garbaged = 0; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
442 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
443 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
444 if (clip_changed || windows_or_buffers_changed) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
445 update_mode_lines++; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
446 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
447 /* Detect case that we need to write a star in the mode line. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
448 if (XFASTINT (w->last_modified) < MODIFF |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
449 && XFASTINT (w->last_modified) <= current_buffer->save_modified) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
450 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
451 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
452 if (buffer_shared > 1) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
453 update_mode_lines++; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
454 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
455 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
456 all_windows = update_mode_lines || buffer_shared > 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
457 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
458 /* If specs for an arrow have changed, do thorough redisplay |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
459 to ensure we remove any arrow that should no longer exist. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
460 if (! EQ (Voverlay_arrow_position, last_arrow_position) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
461 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
462 all_windows = 1, clip_changed = 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
463 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
464 /* Update the menu bar item lists, if appropriate. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
465 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
|
466 or generation of display lines. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
467 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
468 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
469 Lisp_Object tail, frame; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
470 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
471 FOR_EACH_FRAME (tail, frame) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
472 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
473 FRAME_PTR f = XFRAME (frame); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
474 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
475 if (FRAME_VISIBLE_P (f)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
476 update_menu_bars (FRAME_ROOT_WINDOW (f)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
477 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
478 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
479 else if (FRAME_VISIBLE_P (selected_frame)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
480 update_menu_bar (selected_window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
481 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
482 |
769 | 483 /* Do a frame update, taking possible shortcuts into account. |
277 | 484 This is the main external entry point for redisplay. |
485 | |
486 If the last redisplay displayed an echo area message and that | |
487 message is no longer requested, we clear the echo area | |
488 or bring back the minibuffer if that is in use. | |
489 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
490 Do not call eval from within this function. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
491 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
|
492 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
|
493 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
|
494 but can still lose, because this function |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
495 can be called from signal handlers; with alarms set up; |
277 | 496 or with synchronous processes running. |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
497 |
277 | 498 See Fcall_process; if you called it from here, it could be |
499 entered recursively. */ | |
500 | |
501 void | |
502 redisplay () | |
503 { | |
504 register struct window *w = XWINDOW (selected_window); | |
505 register int pause; | |
506 int must_finish = 0; | |
507 int all_windows; | |
508 register int tlbufpos, tlendpos; | |
509 struct position pos; | |
510 extern int input_pending; | |
511 | |
512 if (noninteractive) | |
513 return; | |
514 | |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
515 /* 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
|
516 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
|
517 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
|
518 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
|
519 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
520 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
|
521 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
522 FOR_EACH_FRAME (tail, frame) |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
523 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
524 } |
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
525 |
769 | 526 /* Notice any pending interrupt request to change frame size. */ |
277 | 527 do_pending_window_change (); |
528 | |
769 | 529 if (frame_garbaged) |
277 | 530 { |
3516
f1ca34ddfd84
(redisplay, echo_area_display): Use redraw_garbaged_frames.
Richard M. Stallman <rms@gnu.org>
parents:
3266
diff
changeset
|
531 redraw_garbaged_frames (); |
769 | 532 frame_garbaged = 0; |
277 | 533 } |
534 | |
535 if (clip_changed || windows_or_buffers_changed) | |
536 update_mode_lines++; | |
537 | |
538 /* Detect case that we need to write a star in the mode line. */ | |
539 if (XFASTINT (w->last_modified) < MODIFF | |
540 && XFASTINT (w->last_modified) <= current_buffer->save_modified) | |
541 { | |
542 w->update_mode_line = Qt; | |
543 if (buffer_shared > 1) | |
544 update_mode_lines++; | |
545 } | |
546 | |
769 | 547 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; |
277 | 548 |
549 all_windows = update_mode_lines || buffer_shared > 1; | |
550 | |
551 /* If specs for an arrow have changed, do thorough redisplay | |
552 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
|
553 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
|
554 || ! EQ (Voverlay_arrow_string, last_arrow_string)) |
277 | 555 all_windows = 1, clip_changed = 1; |
556 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
557 /* 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
|
558 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
|
559 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
|
560 again here. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
561 if (echo_area_glyphs || previous_echo_glyphs) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
562 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
563 echo_area_display (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
564 must_finish = 1; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
565 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
566 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
567 /* 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
|
568 if (((!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
569 && !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
|
570 != !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
|
571 || (!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
|
572 && !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
|
573 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
|
574 this_line_bufpos = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
575 |
277 | 576 tlbufpos = this_line_bufpos; |
577 tlendpos = this_line_endpos; | |
485 | 578 if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line) |
769 | 579 && FRAME_VISIBLE_P (XFRAME (w->frame)) |
277 | 580 /* Make sure recorded data applies to current buffer, etc */ |
581 && this_line_buffer == current_buffer | |
582 && current_buffer == XBUFFER (w->buffer) | |
485 | 583 && NILP (w->force_start) |
277 | 584 /* Point must be on the line that we have info recorded about */ |
585 && point >= tlbufpos | |
586 && point <= Z - tlendpos | |
587 /* All text outside that line, including its final newline, | |
588 must be unchanged */ | |
589 && (XFASTINT (w->last_modified) >= MODIFF | |
590 || (beg_unchanged >= tlbufpos - 1 | |
591 && GPT >= tlbufpos | |
528 | 592 /* If selective display, can't optimize |
593 if the changes start at the beginning of the line. */ | |
594 && ((XTYPE (current_buffer->selective_display) == Lisp_Int | |
595 && XINT (current_buffer->selective_display) > 0 | |
596 ? (beg_unchanged >= tlbufpos | |
597 && GPT > tlbufpos) | |
598 : 1)) | |
277 | 599 && end_unchanged >= tlendpos |
600 && Z - GPT >= tlendpos))) | |
601 { | |
602 if (tlbufpos > BEGV && FETCH_CHAR (tlbufpos - 1) != '\n' | |
603 && (tlbufpos == ZV | |
604 || FETCH_CHAR (tlbufpos) == '\n')) | |
605 /* Former continuation line has disappeared by becoming empty */ | |
606 goto cancel; | |
607 else if (XFASTINT (w->last_modified) < MODIFF | |
608 || MINI_WINDOW_P (w)) | |
609 { | |
610 cursor_vpos = -1; | |
611 overlay_arrow_seen = 0; | |
612 display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos, | |
613 pos_tab_offset (w, tlbufpos)); | |
614 /* If line contains point, is not continued, | |
615 and ends at same distance from eob as before, we win */ | |
616 if (cursor_vpos >= 0 && this_line_bufpos | |
617 && this_line_endpos == tlendpos) | |
618 { | |
769 | 619 if (XFASTINT (w->width) != FRAME_WIDTH (XFRAME (WINDOW_FRAME (w)))) |
277 | 620 preserve_other_columns (w); |
621 goto update; | |
622 } | |
623 else | |
624 goto cancel; | |
625 } | |
626 else if (point == XFASTINT (w->last_point)) | |
627 { | |
628 if (!must_finish) | |
629 { | |
630 do_pending_window_change (); | |
631 return; | |
632 } | |
633 goto update; | |
634 } | |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
635 /* If highlighting the region, we can't just move the cursor. */ |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
636 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
|
637 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
638 && NILP (w->region_showing)) |
277 | 639 { |
640 pos = *compute_motion (tlbufpos, 0, | |
641 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0, | |
642 point, 2, - (1 << (SHORTBITS - 1)), | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
643 window_internal_width (w) - 1, |
574 | 644 XINT (w->hscroll), |
645 pos_tab_offset (w, tlbufpos)); | |
277 | 646 if (pos.vpos < 1) |
647 { | |
769 | 648 FRAME_CURSOR_X (selected_frame) |
277 | 649 = XFASTINT (w->left) + max (pos.hpos, 0); |
769 | 650 FRAME_CURSOR_Y (selected_frame) = this_line_vpos; |
277 | 651 goto update; |
652 } | |
653 else | |
654 goto cancel; | |
655 } | |
656 cancel: | |
657 /* Text changed drastically or point moved off of line */ | |
769 | 658 cancel_line (this_line_vpos, selected_frame); |
277 | 659 } |
660 | |
661 this_line_bufpos = 0; | |
662 all_windows |= buffer_shared > 1; | |
663 | |
664 if (all_windows) | |
665 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
666 Lisp_Object tail, frame; |
277 | 667 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
668 #ifdef HAVE_X_WINDOWS |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
669 /* Since we're doing a thorough redisplay, we might as well |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
670 recompute all our display faces. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
671 clear_face_vector (); |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
672 #endif |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
673 |
277 | 674 /* Recompute # windows showing selected buffer. |
433 | 675 This will be incremented each time such a window is displayed. */ |
277 | 676 buffer_shared = 0; |
677 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
678 FOR_EACH_FRAME (tail, frame) |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
679 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
680 FRAME_PTR f = XFRAME (frame); |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2189
diff
changeset
|
681 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
682 /* Mark all the scroll bars to be removed; we'll redeem the ones |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
683 we want when we redisplay their windows. */ |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
684 if (condemn_scroll_bars_hook) |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
685 (*condemn_scroll_bars_hook) (f); |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
686 |
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
687 if (FRAME_VISIBLE_P (f)) |
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
688 redisplay_windows (FRAME_ROOT_WINDOW (f)); |
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
689 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
690 /* Any scroll bars which redisplay_windows should have nuked |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
691 should now go away. */ |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
692 if (judge_scroll_bars_hook) |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
693 (*judge_scroll_bars_hook) (f); |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
694 } |
277 | 695 } |
769 | 696 else if (FRAME_VISIBLE_P (selected_frame)) |
277 | 697 { |
698 redisplay_window (selected_window, 1); | |
769 | 699 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame)) |
277 | 700 preserve_other_columns (w); |
701 } | |
702 | |
703 update: | |
704 /* Prevent various kinds of signals during display update. | |
705 stdio is not robust about handling signals, | |
706 which can cause an apparent I/O error. */ | |
707 if (interrupt_input) | |
708 unrequest_sigio (); | |
709 stop_polling (); | |
710 | |
769 | 711 #ifdef MULTI_FRAME |
277 | 712 if (all_windows) |
713 { | |
714 Lisp_Object tail; | |
715 | |
716 pause = 0; | |
717 | |
769 | 718 for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
277 | 719 { |
769 | 720 FRAME_PTR f; |
277 | 721 |
769 | 722 if (XTYPE (XCONS (tail)->car) != Lisp_Frame) |
277 | 723 continue; |
724 | |
769 | 725 f = XFRAME (XCONS (tail)->car); |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
726 if (FRAME_VISIBLE_P (f)) |
277 | 727 { |
769 | 728 pause |= update_frame (f, 0, 0); |
277 | 729 if (!pause) |
769 | 730 mark_window_display_accurate (f->root_window, 1); |
277 | 731 } |
732 } | |
733 } | |
734 else | |
769 | 735 #endif /* MULTI_FRAME */ |
368 | 736 { |
769 | 737 if (FRAME_VISIBLE_P (selected_frame)) |
738 pause = update_frame (selected_frame, 0, 0); | |
1656
a532c5a23984
* xdisp.c (redisplay): Call FRAME_SAMPLE_VISIBILITY to set the
Jim Blandy <jimb@redhat.com>
parents:
1600
diff
changeset
|
739 |
433 | 740 /* We may have called echo_area_display at the top of this |
769 | 741 function. If the echo area is on another frame, that may |
742 have put text on a frame other than the selected one, so the | |
743 above call to update_frame would not have caught it. Catch | |
433 | 744 it here. */ |
745 { | |
769 | 746 FRAME_PTR mini_frame = |
747 XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))); | |
433 | 748 |
769 | 749 if (mini_frame != selected_frame) |
750 pause |= update_frame (mini_frame, 0, 0); | |
433 | 751 } |
368 | 752 } |
277 | 753 |
769 | 754 /* If frame does not match, prevent doing single-line-update next time. |
277 | 755 Also, don't forget to check every line to update the arrow. */ |
756 if (pause) | |
757 { | |
758 this_line_bufpos = 0; | |
485 | 759 if (!NILP (last_arrow_position)) |
277 | 760 { |
761 last_arrow_position = Qt; | |
762 last_arrow_string = Qt; | |
763 } | |
769 | 764 /* If we pause after scrolling, some lines in current_frame |
277 | 765 may be null, so preserve_other_columns won't be able to |
766 preserve all the vertical-bar separators. So, avoid using it | |
767 in that case. */ | |
769 | 768 if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame)) |
277 | 769 update_mode_lines = 1; |
770 } | |
771 | |
769 | 772 /* Now text on frame agrees with windows, so |
277 | 773 put info into the windows for partial redisplay to follow */ |
774 | |
775 if (!pause) | |
776 { | |
777 register struct buffer *b = XBUFFER (w->buffer); | |
778 | |
779 blank_end_of_window = 0; | |
780 clip_changed = 0; | |
781 unchanged_modified = BUF_MODIFF (b); | |
782 beg_unchanged = BUF_GPT (b) - BUF_BEG (b); | |
783 end_unchanged = BUF_Z (b) - BUF_GPT (b); | |
784 | |
785 XFASTINT (w->last_point) = BUF_PT (b); | |
769 | 786 XFASTINT (w->last_point_x) = FRAME_CURSOR_X (selected_frame); |
787 XFASTINT (w->last_point_y) = FRAME_CURSOR_Y (selected_frame); | |
277 | 788 |
789 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
|
790 mark_window_display_accurate (FRAME_ROOT_WINDOW (selected_frame), 1); |
277 | 791 else |
792 { | |
793 w->update_mode_line = Qnil; | |
794 XFASTINT (w->last_modified) = BUF_MODIFF (b); | |
795 w->window_end_valid = Qt; | |
796 last_arrow_position = Voverlay_arrow_position; | |
797 last_arrow_string = Voverlay_arrow_string; | |
798 } | |
799 update_mode_lines = 0; | |
800 windows_or_buffers_changed = 0; | |
801 } | |
802 | |
803 /* Start SIGIO interrupts coming again. | |
804 Having them off during the code above | |
805 makes it less likely one will discard output, | |
806 but not impossible, since there might be stuff | |
807 in the system buffer here. | |
808 But it is much hairier to try to do anything about that. */ | |
809 | |
810 if (interrupt_input) | |
811 request_sigio (); | |
812 start_polling (); | |
813 | |
769 | 814 /* Change frame size now if a change is pending. */ |
277 | 815 do_pending_window_change (); |
816 } | |
817 | |
818 /* Redisplay, but leave alone any recent echo area message | |
819 unless another message has been requested in its place. | |
820 | |
821 This is useful in situations where you need to redisplay but no | |
822 user action has occurred, making it inappropriate for the message | |
823 area to be cleared. See tracking_off and | |
824 wait_reading_process_input for examples of these situations. */ | |
825 | |
826 redisplay_preserve_echo_area () | |
827 { | |
828 if (echo_area_glyphs == 0 && previous_echo_glyphs != 0) | |
829 { | |
830 echo_area_glyphs = previous_echo_glyphs; | |
831 redisplay (); | |
832 echo_area_glyphs = 0; | |
833 } | |
834 else | |
835 redisplay (); | |
836 } | |
837 | |
838 void | |
839 mark_window_display_accurate (window, flag) | |
840 Lisp_Object window; | |
841 int flag; | |
842 { | |
843 register struct window *w; | |
844 | |
485 | 845 for (;!NILP (window); window = w->next) |
277 | 846 { |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
847 if (XTYPE (window) != Lisp_Window) abort (); |
277 | 848 w = XWINDOW (window); |
849 | |
485 | 850 if (!NILP (w->buffer)) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
851 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
852 XFASTINT (w->last_modified) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
853 = !flag ? 0 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
854 : XBUFFER (w->buffer) == current_buffer |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
855 ? MODIFF : BUF_MODIFF (XBUFFER (w->buffer)); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
856 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
857 /* 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
|
858 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
|
859 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
|
860 && !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
|
861 ? 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
|
862 : Qnil); |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
863 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
864 |
277 | 865 w->window_end_valid = Qt; |
866 w->update_mode_line = Qnil; | |
867 | |
485 | 868 if (!NILP (w->vchild)) |
277 | 869 mark_window_display_accurate (w->vchild, flag); |
485 | 870 if (!NILP (w->hchild)) |
277 | 871 mark_window_display_accurate (w->hchild, flag); |
872 } | |
873 | |
874 if (flag) | |
875 { | |
876 last_arrow_position = Voverlay_arrow_position; | |
877 last_arrow_string = Voverlay_arrow_string; | |
878 } | |
879 else | |
880 { | |
881 /* t is unequal to any useful value of Voverlay_arrow_... */ | |
882 last_arrow_position = Qt; | |
883 last_arrow_string = Qt; | |
884 } | |
885 } | |
886 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
887 /* Update the menu bar item lists for WINDOW |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
888 and its subwindows and siblings. |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
889 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
|
890 because it can call eval. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
891 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
892 static void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
893 update_menu_bars (window) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
894 Lisp_Object window; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
895 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
896 for (; !NILP (window); window = XWINDOW (window)->next) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
897 update_menu_bar (window, 0); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
898 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
899 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
900 /* Update the menu bar item list for window WINDOW and its subwindows. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
901 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
902 static void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
903 update_menu_bar (window, just_this_one) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
904 Lisp_Object window; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
905 int just_this_one; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
906 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
907 register struct window *w = XWINDOW (window); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
908 struct buffer *old = current_buffer; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
909 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
910 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
911 /* If this is a combination window, do its children; that's all. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
912 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
913 if (!NILP (w->vchild)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
914 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
915 update_menu_bars (w->vchild); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
916 return; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
917 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
918 if (!NILP (w->hchild)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
919 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
920 update_menu_bars (w->hchild); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
921 return; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
922 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
923 if (NILP (w->buffer)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
924 abort (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
925 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
926 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
927 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
928 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
929 /* When we reach a frame's selected window, redo the frame's menu bar. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
930 if (!NILP (w->update_mode_line) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
931 && FRAME_MENU_BAR_LINES (f) > 0 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
932 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
933 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
934 /* 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
|
935 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
|
936 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
|
937 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
|
938 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
|
939 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
|
940 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
941 if (windows_or_buffers_changed |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
942 || update_mode_lines |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
943 || (XFASTINT (w->last_modified) < MODIFF |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
944 && (XFASTINT (w->last_modified) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
945 <= XBUFFER (w->buffer)->save_modified))) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
946 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
947 struct buffer *prev = current_buffer; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
948 current_buffer = XBUFFER (w->buffer); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
949 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
950 current_buffer = prev; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
951 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
952 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
953 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
954 |
277 | 955 int do_id = 1; |
956 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
957 /* Redisplay WINDOW and its subwindows and siblings. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
958 |
277 | 959 static void |
960 redisplay_windows (window) | |
961 Lisp_Object window; | |
962 { | |
485 | 963 for (; !NILP (window); window = XWINDOW (window)->next) |
277 | 964 redisplay_window (window, 0); |
965 } | |
966 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
967 /* Redisplay window WINDOW and its subwindows. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
968 |
277 | 969 static void |
970 redisplay_window (window, just_this_one) | |
971 Lisp_Object window; | |
972 int just_this_one; | |
973 { | |
974 register struct window *w = XWINDOW (window); | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
975 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 976 int height; |
977 register int lpoint = point; | |
978 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
|
979 register int width = window_internal_width (w) - 1; |
277 | 980 register int startp; |
981 register int hscroll = XINT (w->hscroll); | |
982 struct position pos; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
983 int opoint = point; |
277 | 984 int tem; |
985 int window_needs_modeline; | |
986 | |
769 | 987 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
277 | 988 |
989 /* If this is a combination window, do its children; that's all. */ | |
990 | |
485 | 991 if (!NILP (w->vchild)) |
277 | 992 { |
993 redisplay_windows (w->vchild); | |
994 return; | |
995 } | |
485 | 996 if (!NILP (w->hchild)) |
277 | 997 { |
998 redisplay_windows (w->hchild); | |
999 return; | |
1000 } | |
485 | 1001 if (NILP (w->buffer)) |
277 | 1002 abort (); |
433 | 1003 |
1004 height = window_internal_height (w); | |
1005 | |
1006 if (MINI_WINDOW_P (w)) | |
1007 { | |
1008 if (w == XWINDOW (minibuf_window)) | |
1009 { | |
1010 if (echo_area_glyphs) | |
1011 /* 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
|
1012 goto finish_scroll_bars; |
433 | 1013 } |
1014 else | |
1015 { | |
1016 /* This is a minibuffer, but it's not the currently active one, so | |
1017 clear it. */ | |
769 | 1018 int vpos = XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top); |
433 | 1019 int i; |
1020 | |
1021 for (i = 0; i < height; i++) | |
1022 { | |
769 | 1023 get_display_line (f, vpos + i, 0); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1024 display_string (w, vpos + i, "", 0, 0, 0, 0, width); |
433 | 1025 } |
1026 | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1027 goto finish_scroll_bars; |
433 | 1028 } |
1029 } | |
277 | 1030 |
1031 if (update_mode_lines) | |
1032 w->update_mode_line = Qt; | |
1033 | |
1034 /* Otherwise set up data on this window; select its buffer and point value */ | |
1035 | |
1036 current_buffer = XBUFFER (w->buffer); | |
1037 opoint = point; | |
1038 | |
1039 /* Count number of windows showing the selected buffer. */ | |
1040 | |
1041 if (!just_this_one | |
1042 && current_buffer == XBUFFER (XWINDOW (selected_window)->buffer)) | |
1043 buffer_shared++; | |
1044 | |
1045 /* POINT refers normally to the selected window. | |
1046 For any other window, set up appropriate value. */ | |
1047 | |
1048 if (!EQ (window, selected_window)) | |
1049 { | |
1050 SET_PT (marker_position (w->pointm)); | |
1051 if (point < BEGV) | |
1052 { | |
485 | 1053 SET_PT (BEGV); |
277 | 1054 Fset_marker (w->pointm, make_number (point), Qnil); |
1055 } | |
1056 else if (point > (ZV - 1)) | |
1057 { | |
485 | 1058 SET_PT (ZV); |
277 | 1059 Fset_marker (w->pointm, make_number (point), Qnil); |
1060 } | |
1061 } | |
1062 | |
1063 /* If window-start is screwed up, choose a new one. */ | |
1064 if (XMARKER (w->start)->buffer != current_buffer) | |
1065 goto recenter; | |
1066 | |
1067 startp = marker_position (w->start); | |
1068 | |
433 | 1069 /* 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
|
1070 unless the specified location is outside the accessible range. */ |
485 | 1071 if (!NILP (w->force_start)) |
277 | 1072 { |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1073 /* 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
|
1074 w->base_line_number = Qnil; |
277 | 1075 w->update_mode_line = Qt; |
1076 w->force_start = Qnil; | |
1077 XFASTINT (w->last_modified) = 0; | |
433 | 1078 if (startp < BEGV) startp = BEGV; |
1079 if (startp > ZV) startp = ZV; | |
277 | 1080 try_window (window, startp); |
1081 if (cursor_vpos < 0) | |
1082 { | |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1083 /* ??? What should happen here if highlighting a region? */ |
277 | 1084 /* If point does not appear, move point so it does appear */ |
1085 pos = *compute_motion (startp, 0, | |
1086 ((EQ (window, minibuf_window) && startp == 1) | |
1087 ? minibuf_prompt_width : 0) | |
1088 + | |
1089 (hscroll ? 1 - hscroll : 0), | |
1090 ZV, height / 2, | |
1091 - (1 << (SHORTBITS - 1)), | |
1092 width, hscroll, pos_tab_offset (w, startp)); | |
1093 SET_PT (pos.bufpos); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1094 if (w != XWINDOW (selected_window)) |
277 | 1095 Fset_marker (w->pointm, make_number (point), Qnil); |
1096 else | |
1097 { | |
5340
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
1098 if (current_buffer == old) |
fcd6e0da3380
(redisplay_window): Before altering lpoint,
Richard M. Stallman <rms@gnu.org>
parents:
5230
diff
changeset
|
1099 lpoint = point; |
769 | 1100 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left); |
1101 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); | |
277 | 1102 } |
1103 } | |
1104 goto done; | |
1105 } | |
1106 | |
1107 /* Handle case where text has not changed, only point, | |
769 | 1108 and it has not moved off the frame */ |
277 | 1109 |
1110 /* This code is not used for minibuffer for the sake of | |
1111 the case of redisplaying to replace an echo area message; | |
1112 since in that case the minibuffer contents per se are usually unchanged. | |
1113 This code is of no real use in the minibuffer since | |
1114 the handling of this_line_bufpos, etc., | |
1115 in redisplay handles the same cases. */ | |
1116 | |
1117 if (XFASTINT (w->last_modified) >= MODIFF | |
1118 && point >= startp && !clip_changed | |
769 | 1119 && (just_this_one || 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
|
1120 /* 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
|
1121 && !(!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
|
1122 && NILP (w->region_showing) |
277 | 1123 && !EQ (window, minibuf_window)) |
1124 { | |
1125 pos = *compute_motion (startp, 0, (hscroll ? 1 - hscroll : 0), | |
1126 point, height + 1, 10000, width, hscroll, | |
1127 pos_tab_offset (w, startp)); | |
1128 | |
1129 if (pos.vpos < height) | |
1130 { | |
769 | 1131 /* Ok, point is still on frame */ |
1132 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
277 | 1133 { |
1134 /* These variables are supposed to be origin 1 */ | |
769 | 1135 FRAME_CURSOR_X (f) = max (0, pos.hpos) + XFASTINT (w->left); |
1136 FRAME_CURSOR_Y (f) = pos.vpos + XFASTINT (w->top); | |
277 | 1137 } |
1138 /* This doesn't do the trick, because if a window to the right of | |
1139 this one must be redisplayed, this does nothing because there | |
769 | 1140 is nothing in DesiredFrame yet, and then the other window is |
277 | 1141 redisplayed, making likes that are empty in this window's columns. |
769 | 1142 if (XFASTINT (w->width) != FRAME_WIDTH (f)) |
277 | 1143 preserve_my_columns (w); |
1144 */ | |
1145 goto done; | |
1146 } | |
1147 /* Don't bother trying redisplay with same start; | |
1148 we already know it will lose */ | |
1149 } | |
1150 /* If current starting point was originally the beginning of a line | |
1151 but no longer is, find a new starting point. */ | |
485 | 1152 else if (!NILP (w->start_at_line_beg) |
277 | 1153 && !(startp == BEGV |
1154 || FETCH_CHAR (startp - 1) == '\n')) | |
1155 { | |
1156 goto recenter; | |
1157 } | |
1158 else if (just_this_one && !MINI_WINDOW_P (w) | |
1159 && point >= startp | |
1160 && 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
|
1161 /* 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
|
1162 && ! NILP (w->start_at_line_beg) |
277 | 1163 && ! EQ (w->window_end_valid, Qnil) |
1164 && do_id && !clip_changed | |
1165 && !blank_end_of_window | |
769 | 1166 && 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
|
1167 /* 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
|
1168 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1169 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1170 && NILP (w->region_showing) |
277 | 1171 && EQ (last_arrow_position, Voverlay_arrow_position) |
1172 && EQ (last_arrow_string, Voverlay_arrow_string) | |
769 | 1173 && (tem = try_window_id (FRAME_SELECTED_WINDOW (f))) |
277 | 1174 && tem != -2) |
1175 { | |
1176 /* tem > 0 means success. tem == -1 means choose new start. | |
1177 tem == -2 means try again with same start, | |
1178 and nothing but whitespace follows the changed stuff. | |
1179 tem == 0 means try again with same start. */ | |
1180 if (tem > 0) | |
1181 goto done; | |
1182 } | |
1183 else if (startp >= BEGV && startp <= ZV | |
1184 /* Avoid starting display at end of buffer! */ | |
433 | 1185 && (startp < ZV || startp == BEGV |
277 | 1186 || (XFASTINT (w->last_modified) >= MODIFF))) |
1187 { | |
1188 /* Try to redisplay starting at same place as before */ | |
769 | 1189 /* If point has not moved off frame, accept the results */ |
277 | 1190 try_window (window, startp); |
1191 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1192 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1193 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
|
1194 /* 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
|
1195 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1196 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1197 } |
277 | 1198 else |
1199 cancel_my_columns (w); | |
1200 } | |
1201 | |
1202 XFASTINT (w->last_modified) = 0; | |
1203 w->update_mode_line = Qt; | |
1204 | |
1205 /* Try to scroll by specified few lines */ | |
1206 | |
1207 if (scroll_step && !clip_changed) | |
1208 { | |
1209 if (point > startp) | |
1210 { | |
1211 pos = *vmotion (Z - XFASTINT (w->window_end_pos), | |
1212 scroll_step, width, hscroll, window); | |
1213 if (pos.vpos >= height) | |
1214 goto scroll_fail; | |
1215 } | |
1216 | |
1217 pos = *vmotion (startp, point < startp ? - scroll_step : scroll_step, | |
1218 width, hscroll, window); | |
1219 | |
1220 if (point >= pos.bufpos) | |
1221 { | |
1222 try_window (window, pos.bufpos); | |
1223 if (cursor_vpos >= 0) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1224 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1225 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
|
1226 /* 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
|
1227 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1228 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1229 } |
277 | 1230 else |
1231 cancel_my_columns (w); | |
1232 } | |
1233 scroll_fail: ; | |
1234 } | |
1235 | |
1236 /* Finally, just choose place to start which centers point */ | |
1237 | |
1238 recenter: | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1239 /* 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
|
1240 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1241 |
277 | 1242 pos = *vmotion (point, - height / 2, width, hscroll, window); |
1243 try_window (window, pos.bufpos); | |
1244 | |
1245 startp = marker_position (w->start); | |
1246 w->start_at_line_beg = | |
1247 (startp == BEGV || FETCH_CHAR (startp - 1) == '\n') ? Qt : Qnil; | |
1248 | |
1249 done: | |
485 | 1250 if ((!NILP (w->update_mode_line) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1251 /* 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
|
1252 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
|
1253 || (!just_this_one && width < FRAME_WIDTH (f) - 1) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1254 || INTEGERP (w->base_line_pos)) |
277 | 1255 && height != XFASTINT (w->height)) |
1256 display_mode_line (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1257 if (! line_number_displayed |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1258 && ! BUFFERP (w->base_line_pos)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1259 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1260 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1261 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
1262 } |
277 | 1263 |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1264 /* When we reach a frame's selected window, redo the frame's menu bar. */ |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1265 if (!NILP (w->update_mode_line) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1266 && FRAME_MENU_BAR_LINES (f) > 0 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1267 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1268 display_menu_bar (w); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
1269 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1270 finish_scroll_bars: |
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1271 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
|
1272 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1273 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1274 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1275 /* 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
|
1276 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
|
1277 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
|
1278 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
|
1279 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
1280 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1281 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
|
1282 if (! MINI_WINDOW_P (w) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1283 || (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
|
1284 { |
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
|
1285 whole = ZV - BEGV; |
2904
d9f7768b0d89
* xdisp.c (redisplay_window): Compute the scrollbar start and end
Jim Blandy <jimb@redhat.com>
parents:
2884
diff
changeset
|
1286 start = startp - BEGV; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1287 /* 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
|
1288 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
|
1289 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
|
1290 |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
1291 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
|
1292 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
|
1293 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1294 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1295 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1296 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1297 /* 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
|
1298 (*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
|
1299 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
1300 /* 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
|
1301 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
|
1302 (*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
|
1303 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
1304 |
277 | 1305 SET_PT (opoint); |
1306 current_buffer = old; | |
1307 SET_PT (lpoint); | |
1308 } | |
1309 | |
1310 /* Do full redisplay on one window, starting at position `pos'. */ | |
1311 | |
1312 static void | |
1313 try_window (window, pos) | |
1314 Lisp_Object window; | |
1315 register int pos; | |
1316 { | |
1317 register struct window *w = XWINDOW (window); | |
1318 register int height = window_internal_height (w); | |
1319 register int vpos = XFASTINT (w->top); | |
1320 register int last_text_vpos = vpos; | |
1321 int tab_offset = pos_tab_offset (w, pos); | |
769 | 1322 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
|
1323 int width = window_internal_width (w) - 1; |
277 | 1324 struct position val; |
1325 | |
1326 Fset_marker (w->start, make_number (pos), Qnil); | |
1327 cursor_vpos = -1; | |
1328 overlay_arrow_seen = 0; | |
1329 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; | |
1330 | |
1331 while (--height >= 0) | |
1332 { | |
1333 val = *display_text_line (w, pos, vpos, val.hpos, tab_offset); | |
1334 tab_offset += width; | |
1335 if (val.vpos) tab_offset = 0; | |
1336 vpos++; | |
1337 if (pos != val.bufpos) | |
1338 last_text_vpos | |
1339 /* Next line, unless prev line ended in end of buffer with no cr */ | |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1340 = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n' |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1341 || ! NILP (Fget_text_property (val.bufpos-1, |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1342 Qinvisible, |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1343 Fcurrent_buffer ())))); |
277 | 1344 pos = val.bufpos; |
1345 } | |
1346 | |
1347 /* If last line is continued in middle of character, | |
769 | 1348 include the split character in the text considered on the frame */ |
277 | 1349 if (val.hpos < (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) |
1350 pos++; | |
1351 | |
769 | 1352 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 1353 if (XFASTINT (w->window_end_pos) == 0 |
1354 && Z != pos) | |
1355 w->update_mode_line = Qt; | |
1356 | |
769 | 1357 /* Say where last char on frame will be, once redisplay is finished. */ |
277 | 1358 XFASTINT (w->window_end_pos) = Z - pos; |
1359 XFASTINT (w->window_end_vpos) = last_text_vpos - XFASTINT (w->top); | |
1360 /* But that is not valid info until redisplay finishes. */ | |
1361 w->window_end_valid = Qnil; | |
1362 } | |
1363 | |
1364 /* Try to redisplay when buffer is modified locally, | |
1365 computing insert/delete line to preserve text outside | |
1366 the bounds of the changes. | |
1367 Return 1 if successful, 0 if if cannot tell what to do, | |
1368 or -1 to tell caller to find a new window start, | |
1369 or -2 to tell caller to do normal redisplay with same window start. */ | |
1370 | |
1371 static int | |
1372 try_window_id (window) | |
1373 Lisp_Object window; | |
1374 { | |
1375 int pos; | |
1376 register struct window *w = XWINDOW (window); | |
1377 register int height = window_internal_height (w); | |
769 | 1378 FRAME_PTR f = XFRAME (w->frame); |
277 | 1379 int top = XFASTINT (w->top); |
1380 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
|
1381 int width = window_internal_width (w) - 1; |
277 | 1382 int hscroll = XINT (w->hscroll); |
1383 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
1384 register int vpos; | |
1385 register int i, tem; | |
1386 int last_text_vpos = 0; | |
1387 int stop_vpos; | |
1388 | |
1389 struct position val, bp, ep, xp, pp; | |
1390 int scroll_amount = 0; | |
1391 int delta; | |
1392 int tab_offset, epto; | |
1393 | |
1394 if (GPT - BEG < beg_unchanged) | |
1395 beg_unchanged = GPT - BEG; | |
1396 if (Z - GPT < end_unchanged) | |
1397 end_unchanged = Z - GPT; | |
1398 | |
1399 if (beg_unchanged + 1 < start) | |
1400 return 0; /* Give up if changes go above top of window */ | |
1401 | |
1402 /* Find position before which nothing is changed. */ | |
1403 bp = *compute_motion (start, 0, lmargin, | |
371 | 1404 beg_unchanged + 1, height + 1, 0, width, hscroll, |
277 | 1405 pos_tab_offset (w, start)); |
1406 if (bp.vpos >= height) | |
368 | 1407 { |
1408 if (point < bp.bufpos && !bp.contin) | |
1409 { | |
769 | 1410 /* All changes are below the frame, and point is on the frame. |
1411 We don't need to change the frame at all. | |
368 | 1412 But we need to update window_end_pos to account for |
1413 any change in buffer size. */ | |
371 | 1414 bp = *compute_motion (start, 0, lmargin, |
1415 Z, height, 0, | |
1416 width, hscroll, pos_tab_offset (w, start)); | |
368 | 1417 XFASTINT (w->window_end_vpos) = height; |
1418 XFASTINT (w->window_end_pos) = Z - bp.bufpos; | |
1419 return 1; | |
1420 } | |
1421 return 0; | |
1422 } | |
277 | 1423 |
1424 vpos = bp.vpos; | |
1425 | |
769 | 1426 /* Find beginning of that frame line. Must display from there. */ |
277 | 1427 bp = *vmotion (bp.bufpos, 0, width, hscroll, window); |
1428 | |
1429 pos = bp.bufpos; | |
1430 val.hpos = lmargin; | |
1431 if (pos < start) | |
1432 return -1; | |
1433 | |
1434 /* If about to start displaying at the beginning of a continuation line, | |
769 | 1435 really start with previous frame line, in case it was not |
277 | 1436 continued when last redisplayed */ |
528 | 1437 if ((bp.contin && bp.bufpos - 1 == beg_unchanged && vpos > 0) |
1438 || | |
1439 /* Likewise if we have to worry about selective display. */ | |
1440 (XTYPE (current_buffer->selective_display) == Lisp_Int | |
1441 && XINT (current_buffer->selective_display) > 0 | |
1442 && bp.bufpos - 1 == beg_unchanged && vpos > 0)) | |
277 | 1443 { |
1444 bp = *vmotion (bp.bufpos, -1, width, hscroll, window); | |
1445 --vpos; | |
1446 pos = bp.bufpos; | |
1447 } | |
1448 | |
1449 if (bp.contin && bp.hpos != lmargin) | |
1450 { | |
1451 val.hpos = bp.prevhpos - width + lmargin; | |
1452 pos--; | |
1453 } | |
1454 | |
1455 bp.vpos = vpos; | |
1456 | |
1457 /* Find first visible newline after which no more is changed. */ | |
1458 tem = find_next_newline (Z - max (end_unchanged, Z - ZV), 1); | |
1459 if (XTYPE (current_buffer->selective_display) == Lisp_Int | |
1460 && XINT (current_buffer->selective_display) > 0) | |
1461 while (tem < ZV - 1 | |
1462 && (position_indentation (tem) | |
1463 >= XINT (current_buffer->selective_display))) | |
1464 tem = find_next_newline (tem, 1); | |
1465 | |
1466 /* Compute the cursor position after that newline. */ | |
1467 ep = *compute_motion (pos, vpos, val.hpos, tem, | |
1468 height, - (1 << (SHORTBITS - 1)), | |
1469 width, hscroll, pos_tab_offset (w, bp.bufpos)); | |
1470 | |
769 | 1471 /* If changes reach past the text available on the frame, |
1472 just display rest of frame. */ | |
277 | 1473 if (ep.bufpos > Z - XFASTINT (w->window_end_pos)) |
1474 stop_vpos = height; | |
1475 else | |
1476 stop_vpos = ep.vpos; | |
1477 | |
1478 /* If no newline before ep, the line ep is on includes some changes | |
1479 that must be displayed. Make sure we don't stop before it. */ | |
1480 /* Also, if changes reach all the way until ep.bufpos, | |
1481 it is possible that something was deleted after the | |
1482 newline before it, so the following line must be redrawn. */ | |
1483 if (stop_vpos == ep.vpos | |
1484 && (ep.bufpos == BEGV | |
1485 || FETCH_CHAR (ep.bufpos - 1) != '\n' | |
1486 || ep.bufpos == Z - end_unchanged)) | |
1487 stop_vpos = ep.vpos + 1; | |
1488 | |
1489 cursor_vpos = -1; | |
1490 overlay_arrow_seen = 0; | |
1491 | |
1492 /* If changes do not reach to bottom of window, | |
1493 figure out how much to scroll the rest of the window */ | |
1494 if (stop_vpos < height) | |
1495 { | |
1496 /* Now determine how far up or down the rest of the window has moved */ | |
1497 epto = pos_tab_offset (w, ep.bufpos); | |
1498 xp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, | |
1499 Z - XFASTINT (w->window_end_pos), | |
1500 10000, 0, width, hscroll, epto); | |
1501 scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos); | |
1502 | |
769 | 1503 /* Is everything on frame below the changes whitespace? |
277 | 1504 If so, no scrolling is really necessary. */ |
1505 for (i = ep.bufpos; i < xp.bufpos; i++) | |
1506 { | |
1507 tem = FETCH_CHAR (i); | |
1508 if (tem != ' ' && tem != '\n' && tem != '\t') | |
1509 break; | |
1510 } | |
1511 if (i == xp.bufpos) | |
1512 return -2; | |
1513 | |
1514 XFASTINT (w->window_end_vpos) += scroll_amount; | |
1515 | |
769 | 1516 /* Before doing any scrolling, verify that point will be on frame. */ |
277 | 1517 if (point > ep.bufpos && !(point <= xp.bufpos && xp.bufpos < height)) |
1518 { | |
1519 if (point <= xp.bufpos) | |
1520 { | |
1521 pp = *compute_motion (ep.bufpos, ep.vpos, ep.hpos, | |
1522 point, height, - (1 << (SHORTBITS - 1)), | |
1523 width, hscroll, epto); | |
1524 } | |
1525 else | |
1526 { | |
1527 pp = *compute_motion (xp.bufpos, xp.vpos, xp.hpos, | |
1528 point, height, - (1 << (SHORTBITS - 1)), | |
1529 width, hscroll, pos_tab_offset (w, xp.bufpos)); | |
1530 } | |
1531 if (pp.bufpos < point || pp.vpos == height) | |
1532 return 0; | |
1533 cursor_vpos = pp.vpos + top; | |
1534 cursor_hpos = pp.hpos + XFASTINT (w->left); | |
1535 } | |
1536 | |
1537 if (stop_vpos - scroll_amount >= height | |
1538 || ep.bufpos == xp.bufpos) | |
1539 { | |
1540 if (scroll_amount < 0) | |
1541 stop_vpos -= scroll_amount; | |
1542 scroll_amount = 0; | |
1543 /* In this path, we have altered window_end_vpos | |
1544 and not left it negative. | |
1545 We must make sure that, in case display is preempted | |
769 | 1546 before the frame changes to reflect what we do here, |
277 | 1547 further updates will not come to try_window_id |
769 | 1548 and assume the frame and window_end_vpos match. */ |
277 | 1549 blank_end_of_window = 1; |
1550 } | |
1551 else if (!scroll_amount) | |
1552 {} | |
1553 else if (bp.bufpos == Z - end_unchanged) | |
1554 { | |
1555 /* If reprinting everything is nearly as fast as scrolling, | |
1556 don't bother scrolling. Can happen if lines are short. */ | |
769 | 1557 if (scroll_cost (f, bp.vpos + top - scroll_amount, |
277 | 1558 top + height - max (0, scroll_amount), |
1559 scroll_amount) | |
1560 > xp.bufpos - bp.bufpos - 20) | |
1561 /* Return "try normal display with same window-start." | |
1562 Too bad we can't prevent further scroll-thinking. */ | |
1563 return -2; | |
1564 /* If pure deletion, scroll up as many lines as possible. | |
1565 In common case of killing a line, this can save the | |
1566 following line from being overwritten by scrolling | |
1567 and therefore having to be redrawn. */ | |
769 | 1568 tem = scroll_frame_lines (f, bp.vpos + top - scroll_amount, |
277 | 1569 top + height - max (0, scroll_amount), |
1570 scroll_amount); | |
1571 if (!tem) stop_vpos = height; | |
1572 } | |
1573 else if (scroll_amount) | |
1574 { | |
1575 /* If reprinting everything is nearly as fast as scrolling, | |
1576 don't bother scrolling. Can happen if lines are short. */ | |
1577 /* Note that if scroll_amount > 0, xp.bufpos - bp.bufpos is an | |
1578 overestimate of cost of reprinting, since xp.bufpos | |
1579 would end up below the bottom of the window. */ | |
769 | 1580 if (scroll_cost (f, ep.vpos + top - scroll_amount, |
277 | 1581 top + height - max (0, scroll_amount), |
1582 scroll_amount) | |
1583 > xp.bufpos - ep.bufpos - 20) | |
1584 /* Return "try normal display with same window-start." | |
1585 Too bad we can't prevent further scroll-thinking. */ | |
1586 return -2; | |
769 | 1587 tem = scroll_frame_lines (f, ep.vpos + top - scroll_amount, |
277 | 1588 top + height - max (0, scroll_amount), |
1589 scroll_amount); | |
1590 if (!tem) stop_vpos = height; | |
1591 } | |
1592 } | |
1593 | |
1594 /* In any case, do not display past bottom of window */ | |
1595 if (stop_vpos >= height) | |
1596 { | |
1597 stop_vpos = height; | |
1598 scroll_amount = 0; | |
1599 } | |
1600 | |
1601 /* Handle case where pos is before w->start -- | |
1602 can happen if part of line had been clipped and is not clipped now */ | |
1603 if (vpos == 0 && pos < marker_position (w->start)) | |
1604 Fset_marker (w->start, make_number (pos), Qnil); | |
1605 | |
1606 /* Redisplay the lines where the text was changed */ | |
1607 last_text_vpos = vpos; | |
1608 tab_offset = pos_tab_offset (w, pos); | |
1609 /* If we are starting display in mid-character, correct tab_offset | |
1610 to account for passing the line that that character really starts in. */ | |
1611 if (val.hpos < lmargin) | |
1612 tab_offset += width; | |
1613 while (vpos < stop_vpos) | |
1614 { | |
1615 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset); | |
1616 tab_offset += width; | |
1617 if (val.vpos) tab_offset = 0; | |
1618 if (pos != val.bufpos) | |
1619 last_text_vpos | |
1620 /* Next line, unless prev line ended in end of buffer with no cr */ | |
1621 = vpos - (val.vpos && FETCH_CHAR (val.bufpos - 1) != '\n'); | |
1622 pos = val.bufpos; | |
1623 } | |
1624 | |
1625 /* There are two cases: | |
1626 1) we have displayed down to the bottom of the window | |
1627 2) we have scrolled lines below stop_vpos by scroll_amount */ | |
1628 | |
1629 if (vpos == height) | |
1630 { | |
1631 /* If last line is continued in middle of character, | |
769 | 1632 include the split character in the text considered on the frame */ |
277 | 1633 if (val.hpos < lmargin) |
1634 val.bufpos++; | |
1635 XFASTINT (w->window_end_vpos) = last_text_vpos; | |
1636 XFASTINT (w->window_end_pos) = Z - val.bufpos; | |
1637 } | |
1638 | |
1639 /* If scrolling made blank lines at window bottom, | |
1640 redisplay to fill those lines */ | |
1641 if (scroll_amount < 0) | |
1642 { | |
1643 /* Don't consider these lines for general-purpose scrolling. | |
1644 That will save time in the scrolling computation. */ | |
769 | 1645 FRAME_SCROLL_BOTTOM_VPOS (f) = xp.vpos; |
277 | 1646 vpos = xp.vpos; |
1647 pos = xp.bufpos; | |
1648 val.hpos = lmargin; | |
1649 if (pos == ZV) | |
1650 vpos = height + scroll_amount; | |
1651 else if (xp.contin && xp.hpos != lmargin) | |
1652 { | |
1653 val.hpos = xp.prevhpos - width + lmargin; | |
1654 pos--; | |
1655 } | |
1656 | |
1657 blank_end_of_window = 1; | |
1658 tab_offset = pos_tab_offset (w, pos); | |
1659 /* If we are starting display in mid-character, correct tab_offset | |
1660 to account for passing the line that that character starts in. */ | |
1661 if (val.hpos < lmargin) | |
1662 tab_offset += width; | |
1663 | |
1664 while (vpos < height) | |
1665 { | |
1666 val = *display_text_line (w, pos, top + vpos++, val.hpos, tab_offset); | |
1667 tab_offset += width; | |
1668 if (val.vpos) tab_offset = 0; | |
1669 pos = val.bufpos; | |
1670 } | |
1671 | |
1672 /* Here is a case where display_text_line sets cursor_vpos wrong. | |
1673 Make it be fixed up, below. */ | |
1674 if (xp.bufpos == ZV | |
1675 && xp.bufpos == point) | |
1676 cursor_vpos = -1; | |
1677 } | |
1678 | |
769 | 1679 /* If bottom just moved off end of frame, change mode line percentage. */ |
277 | 1680 if (XFASTINT (w->window_end_pos) == 0 |
1681 && Z != val.bufpos) | |
1682 w->update_mode_line = Qt; | |
1683 | |
1684 /* Attempt to adjust end-of-text positions to new bottom line */ | |
1685 if (scroll_amount) | |
1686 { | |
1687 delta = height - xp.vpos; | |
1688 if (delta < 0 | |
1689 || (delta > 0 && xp.bufpos <= ZV) | |
1690 || (delta == 0 && xp.hpos)) | |
1691 { | |
1692 val = *vmotion (Z - XFASTINT (w->window_end_pos), | |
1693 delta, width, hscroll, window); | |
1694 XFASTINT (w->window_end_pos) = Z - val.bufpos; | |
1695 XFASTINT (w->window_end_vpos) += val.vpos; | |
1696 } | |
1697 } | |
1698 | |
1699 w->window_end_valid = Qnil; | |
1700 | |
1701 /* If point was not in a line that was displayed, find it */ | |
1702 if (cursor_vpos < 0) | |
1703 { | |
1704 val = *compute_motion (start, 0, lmargin, point, 10000, 10000, | |
1705 width, hscroll, pos_tab_offset (w, start)); | |
769 | 1706 /* Admit failure if point is off frame now */ |
277 | 1707 if (val.vpos >= height) |
1708 { | |
1709 for (vpos = 0; vpos < height; vpos++) | |
769 | 1710 cancel_line (vpos + top, f); |
277 | 1711 return 0; |
1712 } | |
1713 cursor_vpos = val.vpos + top; | |
1714 cursor_hpos = val.hpos + XFASTINT (w->left); | |
1715 } | |
1716 | |
769 | 1717 FRAME_CURSOR_X (f) = max (0, cursor_hpos); |
1718 FRAME_CURSOR_Y (f) = cursor_vpos; | |
277 | 1719 |
1720 if (debug_end_pos) | |
1721 { | |
1722 val = *compute_motion (start, 0, lmargin, ZV, | |
1723 height, - (1 << (SHORTBITS - 1)), | |
1724 width, hscroll, pos_tab_offset (w, start)); | |
1725 if (val.vpos != XFASTINT (w->window_end_vpos)) | |
1726 abort (); | |
1727 if (XFASTINT (w->window_end_pos) | |
1728 != Z - val.bufpos) | |
1729 abort (); | |
1730 } | |
1731 | |
1732 return 1; | |
1733 } | |
1734 | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1735 /* 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
|
1736 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
|
1737 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1738 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
|
1739 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
|
1740 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
|
1741 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
|
1742 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
|
1743 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1744 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
|
1745 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
|
1746 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
|
1747 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1748 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
|
1749 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
|
1750 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
|
1751 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
|
1752 called. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1753 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1754 void |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1755 redisplay_region (buf, start, end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1756 struct buffer *buf; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1757 int start, end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1758 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1759 if (start == end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1760 return; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1761 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1762 if (start > end) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1763 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1764 int temp = start; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1765 start = end; end = temp; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1766 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1767 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1768 if (buf != current_buffer) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1769 windows_or_buffers_changed = 1; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1770 else |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1771 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1772 if (unchanged_modified == MODIFF) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1773 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1774 beg_unchanged = start - BEG; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1775 end_unchanged = Z - end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1776 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1777 else |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1778 { |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1779 if (Z - end < end_unchanged) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1780 end_unchanged = Z - end; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1781 if (start - BEG < beg_unchanged) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1782 beg_unchanged = start - BEG; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1783 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1784 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1785 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1786 /* Increment the buffer's time stamp, but also increment the save |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1787 and autosave timestamps, so as not to screw up that timekeeping. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1788 if (BUF_MODIFF (buf) == buf->save_modified) |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1789 buf->save_modified++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1790 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
|
1791 buf->auto_save_modified++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1792 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1793 BUF_MODIFF (buf) ++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1794 } |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1795 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1796 |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1797 /* Copy glyphs from the vector FROM to the rope T. |
301 | 1798 But don't actually copy the parts that would come in before S. |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1799 Value is T, advanced past the copied data. */ |
277 | 1800 |
1801 GLYPH * | |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1802 copy_rope (t, s, from, face) |
277 | 1803 register GLYPH *t; /* Copy to here. */ |
1804 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
|
1805 Lisp_Object from; /* Data to copy; known to be a vector. */ |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1806 int face; /* Face to apply to glyphs which don't specify one. */ |
277 | 1807 { |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1808 register int n = XVECTOR (from)->size; |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1809 register Lisp_Object *f = XVECTOR (from)->contents; |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1810 |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1811 while (n--) |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1812 { |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1813 int glyph = XFASTINT (*f); |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1814 |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1815 if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph), |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1816 (GLYPH_FACE (glyph) |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1817 ? GLYPH_FACE (glyph) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1818 : face)); |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1819 ++t; |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1820 ++f; |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1821 } |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1822 return t; |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1823 } |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1824 |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1825 /* Copy exactly LEN glyphs from FROM into data at T. |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1826 But don't alter words before S. */ |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1827 |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1828 GLYPH * |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1829 copy_part_of_rope (t, s, from, len, face) |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1830 register GLYPH *t; /* Copy to here. */ |
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1831 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
|
1832 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
|
1833 int len; |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1834 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
|
1835 { |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1836 int n = len; |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1837 register Lisp_Object *f = from; |
277 | 1838 |
1839 while (n--) | |
1840 { | |
3689
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1841 int glyph = XFASTINT (*f); |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1842 |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1843 if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph), |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1844 (GLYPH_FACE (glyph) |
82856e3ea14d
(echo_area_display): Use XFASTINT on ->height.
Richard M. Stallman <rms@gnu.org>
parents:
3648
diff
changeset
|
1845 ? GLYPH_FACE (glyph) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1846 : face)); |
277 | 1847 ++t; |
1848 ++f; | |
1849 } | |
1850 return t; | |
1851 } | |
1852 | |
1853 /* Display one line of window w, starting at position START in W's buffer. | |
1854 Display starting at horizontal position HPOS, which is normally zero | |
1855 or negative. A negative value causes output up to hpos = 0 to be discarded. | |
1856 This is done for negative hscroll, or when this is a continuation line | |
1857 and the continuation occurred in the middle of a multi-column character. | |
1858 | |
1859 TABOFFSET is an offset for ostensible hpos, used in tab stop calculations. | |
1860 | |
769 | 1861 Display on position VPOS on the frame. (origin 0). |
277 | 1862 |
1863 Returns a STRUCT POSITION giving character to start next line with | |
1864 and where to display it, including a zero or negative hpos. | |
1865 The vpos field is not really a vpos; it is 1 unless the line is continued */ | |
1866 | |
1867 struct position val_display_text_line; | |
1868 | |
1869 static struct position * | |
1870 display_text_line (w, start, vpos, hpos, taboffset) | |
1871 struct window *w; | |
1872 int start; | |
1873 int vpos; | |
1874 int hpos; | |
1875 int taboffset; | |
1876 { | |
1877 register int pos = start; | |
1878 register int c; | |
1879 register GLYPH *p1; | |
1880 int end; | |
1881 register int pause; | |
1882 register unsigned char *p; | |
1883 GLYPH *endp; | |
1884 register GLYPH *startp; | |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
1885 register GLYPH *p1prev = 0; |
769 | 1886 FRAME_PTR f = XFRAME (w->frame); |
277 | 1887 int tab_width = XINT (current_buffer->tab_width); |
485 | 1888 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
|
1889 int width = window_internal_width (w) - 1; |
277 | 1890 struct position val; |
1891 int lastpos; | |
1892 int invis; | |
1893 int hscroll = XINT (w->hscroll); | |
1894 int truncate = hscroll | |
1895 || (truncate_partial_width_windows | |
769 | 1896 && XFASTINT (w->width) < FRAME_WIDTH (f)) |
485 | 1897 || !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
|
1898 |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1899 /* 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
|
1900 int highlight_region |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1901 = !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
|
1902 int region_beg, region_end; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1903 |
277 | 1904 int selective |
1905 = XTYPE (current_buffer->selective_display) == Lisp_Int | |
1906 ? XINT (current_buffer->selective_display) | |
485 | 1907 : !NILP (current_buffer->selective_display) ? -1 : 0; |
769 | 1908 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 1909 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
|
1910 |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1911 Lisp_Object default_invis_vector[3]; |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1912 /* Nonzero means display something where 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
|
1913 The precise value is the number of glyphs to display. */ |
277 | 1914 int selective_rlen |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
1915 = (selective && dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1916 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1917 : selective && !NILP (current_buffer->selective_display_ellipses) |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1918 ? 3 : 0); |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1919 /* 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
|
1920 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
|
1921 Lisp_Object *invis_vector_contents |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1922 = (dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1923 ? 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
|
1924 : default_invis_vector); |
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1925 |
277 | 1926 GLYPH truncator = (dp == 0 || XTYPE (DISP_TRUNC_GLYPH (dp)) != Lisp_Int |
1927 ? '$' : XINT (DISP_TRUNC_GLYPH (dp))); | |
1928 GLYPH continuer = (dp == 0 || XTYPE (DISP_CONTINUE_GLYPH (dp)) != Lisp_Int | |
1929 ? '\\' : XINT (DISP_CONTINUE_GLYPH (dp))); | |
1930 | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1931 /* 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
|
1932 to overlays or text property changes. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1933 int next_face_change; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1934 |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1935 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1936 /* 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
|
1937 int next_invisible; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1938 #endif |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1939 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1940 /* 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
|
1941 int current_face = 0; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1942 |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
1943 XFASTINT (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
|
1944 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
|
1945 |
277 | 1946 hpos += XFASTINT (w->left); |
769 | 1947 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
|
1948 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 1949 |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1950 /* 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
|
1951 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
|
1952 /* 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
|
1953 && (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
|
1954 || w == XWINDOW (selected_window))) |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1955 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1956 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
|
1957 if (PT < region_beg) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1958 { |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1959 region_end = region_beg; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1960 region_beg = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1961 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1962 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1963 region_end = PT; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1964 w->region_showing = Qt; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1965 } |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1966 else |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1967 region_beg = region_end = -1; |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
1968 |
277 | 1969 if (MINI_WINDOW_P (w) && start == 1 |
1970 && vpos == XFASTINT (w->top)) | |
1971 { | |
1972 if (minibuf_prompt) | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
1973 hpos = display_string (w, vpos, minibuf_prompt, -1, hpos, |
277 | 1974 (!truncate ? continuer : truncator), |
1975 -1, -1); | |
1976 minibuf_prompt_width = hpos; | |
1977 } | |
1978 | |
1979 desired_glyphs->bufp[vpos] = pos; | |
1980 p1 = desired_glyphs->glyphs[vpos] + hpos; | |
1981 end = ZV; | |
1982 startp = desired_glyphs->glyphs[vpos] + XFASTINT (w->left); | |
1983 endp = startp + width; | |
1984 | |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
1985 /* 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
|
1986 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
|
1987 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
|
1988 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
|
1989 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
|
1990 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
|
1991 |
277 | 1992 /* Loop generating characters. |
1993 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
|
1994 if reach or pass continuation column, |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1995 or at face change. */ |
277 | 1996 pause = pos; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
1997 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
|
1998 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
1999 next_invisible = pos; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2000 #endif |
277 | 2001 while (p1 < endp) |
2002 { | |
2003 p1prev = p1; | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2004 if (pos >= pause) |
277 | 2005 { |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2006 /* 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
|
2007 Stop here. */ |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2008 if (pos >= end) |
277 | 2009 break; |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2010 |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2011 /* Did we reach point? Record the cursor location. */ |
277 | 2012 if (pos == point && cursor_vpos < 0) |
2013 { | |
2014 cursor_vpos = vpos; | |
2015 cursor_hpos = p1 - startp; | |
2016 } | |
2017 | |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2018 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2019 /* 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
|
2020 the next property change */ |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2021 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
|
2022 { |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2023 Lisp_Object position, limit, endpos, prop; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2024 XFASTINT (position) = pos; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2025 prop = Fget_text_property (position, Qinvisible, |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2026 Fcurrent_buffer ()); |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2027 /* 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
|
2028 performance; nothing should go wrong if it is too small. */ |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2029 XFASTINT (limit) = pos + 50; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2030 endpos |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2031 = Fnext_single_property_change (position, Qinvisible, |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2032 Fcurrent_buffer (), limit); |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2033 if (INTEGERP (endpos)) |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2034 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
|
2035 else |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2036 next_invisible = end; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2037 if (! NILP (prop)) |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2038 { |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2039 if (pos < point && next_invisible >= point) |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2040 { |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2041 cursor_vpos = vpos; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2042 cursor_hpos = p1 - startp; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2043 } |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2044 pos = next_invisible; |
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2045 } |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2046 } |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2047 if (pos >= end) |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2048 break; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2049 #endif |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2050 |
2742
7800e6a86421
* xdisp.c (display_text_line): Make face-handling code conditional
Jim Blandy <jimb@redhat.com>
parents:
2729
diff
changeset
|
2051 #ifdef HAVE_X_WINDOWS |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2052 /* 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
|
2053 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
|
2054 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
|
2055 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
|
2056 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
|
2057 region_beg, region_end, |
5082
47a76678bf4d
(display_text_line): Pass new arg to compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2058 &next_face_change, pos + 50); |
2742
7800e6a86421
* xdisp.c (display_text_line): Make face-handling code conditional
Jim Blandy <jimb@redhat.com>
parents:
2729
diff
changeset
|
2059 #endif |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2060 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2061 pause = end; |
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2062 |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2063 #ifdef USE_TEXT_PROPERTIES |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2064 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
|
2065 pause = next_invisible; |
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
2066 #endif |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2067 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
|
2068 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
|
2069 |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2070 /* 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
|
2071 the phone? */ |
277 | 2072 if (pos < point && point < pause) |
2073 pause = point; | |
2074 if (pos < GPT && GPT < pause) | |
2075 pause = GPT; | |
2076 | |
2077 p = &FETCH_CHAR (pos); | |
2078 } | |
2079 c = *p++; | |
2080 if (c >= 040 && c < 0177 | |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2081 && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector)) |
277 | 2082 { |
2083 if (p1 >= startp) | |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2084 *p1 = MAKE_GLYPH (c, current_face); |
277 | 2085 p1++; |
2086 } | |
2087 else if (c == '\n') | |
2088 { | |
2089 invis = 0; | |
2090 while (pos < end | |
2091 && selective > 0 | |
2092 && position_indentation (pos + 1) >= selective) | |
2093 { | |
2094 invis = 1; | |
2095 pos = find_next_newline (pos + 1, 1); | |
2096 if (FETCH_CHAR (pos - 1) == '\n') | |
2097 pos--; | |
2098 } | |
2099 if (invis && selective_rlen > 0 && p1 >= startp) | |
2100 { | |
2101 p1 += selective_rlen; | |
2102 if (p1 - startp > width) | |
2103 p1 = endp; | |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2104 copy_part_of_rope (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
|
2105 (p1 - p1prev), current_face); |
277 | 2106 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2107 #if 1 |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2108 /* 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
|
2109 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
|
2110 if (current_face) |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2111 while (p1 < endp) |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2112 *p1++ = MAKE_GLYPH (' ', current_face); |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2113 #endif |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2114 break; |
277 | 2115 } |
2116 else if (c == '\t') | |
2117 { | |
2118 do | |
2119 { | |
2120 if (p1 >= startp && p1 < endp) | |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2121 *p1 = MAKE_GLYPH (' ', current_face); |
277 | 2122 p1++; |
2123 } | |
2124 while ((p1 - startp + taboffset + hscroll - (hscroll > 0)) | |
2125 % tab_width); | |
2126 } | |
368 | 2127 else if (c == Ctl ('M') && selective == -1) |
277 | 2128 { |
2129 pos = find_next_newline (pos, 1); | |
2130 if (FETCH_CHAR (pos - 1) == '\n') | |
2131 pos--; | |
2132 if (selective_rlen > 0) | |
2133 { | |
2134 p1 += selective_rlen; | |
2135 if (p1 - startp > width) | |
2136 p1 = endp; | |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2137 copy_part_of_rope (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
|
2138 (p1 - p1prev), current_face); |
277 | 2139 } |
2884
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2140 #if 1 |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2141 /* 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
|
2142 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
|
2143 if (current_face) |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2144 while (p1 < endp) |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2145 *p1++ = MAKE_GLYPH (' ', current_face); |
e52ea063421a
* xdisp.c (display_text_line): If the newline (or C-m, in
Jim Blandy <jimb@redhat.com>
parents:
2874
diff
changeset
|
2146 #endif |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
2147 break; |
277 | 2148 } |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
2149 else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector) |
277 | 2150 { |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2151 p1 = copy_rope (p1, startp, DISP_CHAR_VECTOR (dp, c), current_face); |
277 | 2152 } |
2153 else if (c < 0200 && ctl_arrow) | |
2154 { | |
2155 if (p1 >= startp) | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2156 *p1 = MAKE_GLYPH ((dp && XTYPE (DISP_CTRL_GLYPH (dp)) == Lisp_Int |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2157 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'), |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2158 current_face); |
277 | 2159 p1++; |
368 | 2160 if (p1 >= startp && p1 < endp) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2161 *p1 = MAKE_GLYPH (c ^ 0100, current_face); |
277 | 2162 p1++; |
2163 } | |
2164 else | |
2165 { | |
2166 if (p1 >= startp) | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2167 *p1 = MAKE_GLYPH ((dp && XTYPE (DISP_ESCAPE_GLYPH (dp)) == Lisp_Int |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2168 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2169 current_face); |
277 | 2170 p1++; |
368 | 2171 if (p1 >= startp && p1 < endp) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2172 *p1 = MAKE_GLYPH ((c >> 6) + '0', current_face); |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2173 p1++; |
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2174 if (p1 >= startp && p1 < endp) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2175 *p1 = MAKE_GLYPH ((7 & (c >> 3)) + '0', current_face); |
277 | 2176 p1++; |
368 | 2177 if (p1 >= startp && p1 < endp) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
2178 *p1 = MAKE_GLYPH ((7 & c) + '0', current_face); |
277 | 2179 p1++; |
2180 } | |
2729
76afd3322533
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2526
diff
changeset
|
2181 |
277 | 2182 pos++; |
2183 } | |
2184 | |
2185 val.hpos = - XINT (w->hscroll); | |
2186 if (val.hpos) | |
2187 val.hpos++; | |
2188 | |
2189 val.vpos = 1; | |
2190 | |
2191 lastpos = pos; | |
2192 | |
2193 /* Handle continuation in middle of a character */ | |
2194 /* by backing up over it */ | |
2195 if (p1 > endp) | |
2196 { | |
3586
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2197 /* 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
|
2198 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
|
2199 if (p1prev) |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2200 { |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2201 /* 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
|
2202 pos--; |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2203 /* 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
|
2204 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
|
2205 } |
7d077274d4bb
* xdisp.c (display_text_line): Handle case where line ends in a
Jim Blandy <jimb@redhat.com>
parents:
3516
diff
changeset
|
2206 |
277 | 2207 /* Keep in this line everything up to the continuation column. */ |
2208 p1 = endp; | |
2209 } | |
2210 | |
2211 /* Finish deciding which character to start the next line on, | |
2212 and what hpos to start it at. | |
2213 Also set `lastpos' to the last position which counts as "on this line" | |
2214 for cursor-positioning. */ | |
2215 | |
2216 if (pos < ZV) | |
2217 { | |
2218 if (FETCH_CHAR (pos) == '\n') | |
2219 /* If stopped due to a newline, start next line after it */ | |
2220 pos++; | |
2221 else | |
2222 /* Stopped due to right margin of window */ | |
2223 { | |
2224 if (truncate) | |
2225 { | |
2226 *p1++ = truncator; | |
2227 /* Truncating => start next line after next newline, | |
2228 and point is on this line if it is before the newline, | |
2229 and skip none of first char of next line */ | |
2230 pos = find_next_newline (pos, 1); | |
2231 val.hpos = XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0; | |
2232 | |
2233 lastpos = pos - (FETCH_CHAR (pos - 1) == '\n'); | |
2234 } | |
2235 else | |
2236 { | |
2237 *p1++ = continuer; | |
2238 val.vpos = 0; | |
2239 lastpos--; | |
2240 } | |
2241 } | |
2242 } | |
2243 | |
2244 /* If point is at eol or in invisible text at eol, | |
769 | 2245 record its frame location now. */ |
277 | 2246 |
2247 if (start <= point && point <= lastpos && cursor_vpos < 0) | |
2248 { | |
2249 cursor_vpos = vpos; | |
2250 cursor_hpos = p1 - startp; | |
2251 } | |
2252 | |
2253 if (cursor_vpos == vpos) | |
2254 { | |
2255 if (cursor_hpos < 0) cursor_hpos = 0; | |
2256 if (cursor_hpos > width) cursor_hpos = width; | |
2257 cursor_hpos += XFASTINT (w->left); | |
769 | 2258 if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) |
277 | 2259 { |
769 | 2260 FRAME_CURSOR_Y (f) = cursor_vpos; |
2261 FRAME_CURSOR_X (f) = cursor_hpos; | |
277 | 2262 |
2263 if (w == XWINDOW (selected_window)) | |
2264 { | |
2265 /* Line is not continued and did not start | |
2266 in middle of character */ | |
2267 if ((hpos - XFASTINT (w->left) | |
2268 == (XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0)) | |
2269 && val.vpos) | |
2270 { | |
2271 this_line_bufpos = start; | |
2272 this_line_buffer = current_buffer; | |
2273 this_line_vpos = cursor_vpos; | |
2274 this_line_start_hpos = hpos; | |
2275 this_line_endpos = Z - lastpos; | |
2276 } | |
2277 else | |
2278 this_line_bufpos = 0; | |
2279 } | |
2280 } | |
2281 } | |
2282 | |
2283 /* If hscroll and line not empty, insert truncation-at-left marker */ | |
2284 if (hscroll && lastpos != start) | |
2285 { | |
2286 *startp = truncator; | |
2287 if (p1 <= startp) | |
2288 p1 = startp + 1; | |
2289 } | |
2290 | |
769 | 2291 if (XFASTINT (w->width) + XFASTINT (w->left) != FRAME_WIDTH (f)) |
277 | 2292 { |
2293 endp++; | |
2294 if (p1 < startp) p1 = startp; | |
2295 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
|
2296 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2297 /* 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
|
2298 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
|
2299 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
|
2300 reconfigured. */ |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2301 *p1++ = (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
|
2302 ? ' ' : '|'); |
277 | 2303 } |
2304 desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], | |
2305 p1 - desired_glyphs->glyphs[vpos]); | |
2306 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
2307 | |
2308 /* If the start of this line is the overlay arrow-position, | |
2309 then put the arrow string into the display-line. */ | |
2310 | |
2311 if (XTYPE (Voverlay_arrow_position) == Lisp_Marker | |
2312 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer | |
2313 && start == marker_position (Voverlay_arrow_position) | |
2314 && XTYPE (Voverlay_arrow_string) == Lisp_String | |
2315 && ! overlay_arrow_seen) | |
2316 { | |
2317 unsigned char *p = XSTRING (Voverlay_arrow_string)->data; | |
2318 int i; | |
2319 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
|
2320 int arrow_end; |
277 | 2321 |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2322 if (len > width) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2323 len = width; |
277 | 2324 for (i = 0; i < len; i++) |
2325 startp[i] = p[i]; | |
3726
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2326 |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2327 /* Bug in SunOS 4.1.1 compiler requires this intermediate variable. */ |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2328 arrow_end = (startp - desired_glyphs->glyphs[vpos]) + len; |
33e82e88a210
* xdisp.c (display_text_line): Use temporary variable.
Jim Blandy <jimb@redhat.com>
parents:
3689
diff
changeset
|
2329 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
|
2330 desired_glyphs->used[vpos] = arrow_end; |
277 | 2331 |
2332 overlay_arrow_seen = 1; | |
2333 } | |
2334 | |
2335 val.bufpos = pos; | |
2336 val_display_text_line = val; | |
2337 return &val_display_text_line; | |
2338 } | |
2339 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2340 /* 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
|
2341 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2342 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2343 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2344 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2345 { |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2346 Lisp_Object items, tail; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2347 register int vpos = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2348 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2349 int maxendcol = FRAME_WIDTH (f); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2350 int hpos = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2351 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2352 if (FRAME_MENU_BAR_LINES (f) <= 0) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2353 return; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2354 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2355 get_display_line (f, vpos, 0); |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2356 |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2357 for (tail = FRAME_MENU_BAR_ITEMS (f); CONSP (tail); tail = XCONS (tail)->cdr) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2358 { |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2359 Lisp_Object string; |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2360 |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2361 string = XCONS (XCONS (XCONS (tail)->car)->cdr)->car; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2362 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2363 /* Record in each item its hpos. */ |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2364 XFASTINT (XCONS (XCONS (XCONS (tail)->car)->cdr)->cdr) = hpos; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2365 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2366 if (hpos < maxendcol) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2367 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
|
2368 XSTRING (string)->data, |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2369 XSTRING (string)->size, |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2370 hpos, 0, hpos, maxendcol); |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2371 /* Put a gap of 3 spaces between items. */ |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2372 if (hpos < maxendcol) |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2373 { |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2374 int hpos1 = hpos + 3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2375 hpos = display_string (w, vpos, "", 0, hpos, 0, |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2376 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
|
2377 } |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2378 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2379 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2380 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2381 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
|
2382 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
2383 /* 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
|
2384 if (maxendcol > hpos) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2385 hpos = display_string (w, vpos, "", 0, hpos, 0, maxendcol, -1); |
4423
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2386 |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2387 /* 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
|
2388 vpos++; |
53f7c5b30816
* xdisp.c (display_menu_bar): Redisplay all lines occupied by the
Jim Blandy <jimb@redhat.com>
parents:
4386
diff
changeset
|
2389 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
|
2390 get_display_line (f, vpos++, 0); |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2391 } |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
2392 |
277 | 2393 /* Display the mode line for window w */ |
2394 | |
2395 static void | |
2396 display_mode_line (w) | |
2397 struct window *w; | |
2398 { | |
2399 register int vpos = XFASTINT (w->height) + XFASTINT (w->top) - 1; | |
2400 register int left = XFASTINT (w->left); | |
2401 register int right = XFASTINT (w->width) + left; | |
769 | 2402 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
277 | 2403 |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2404 line_number_displayed = 0; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2405 |
769 | 2406 get_display_line (f, vpos, left); |
277 | 2407 display_mode_element (w, vpos, left, 0, right, right, |
2408 current_buffer->mode_line_format); | |
769 | 2409 FRAME_DESIRED_GLYPHS (f)->bufp[vpos] = 0; |
277 | 2410 |
2411 /* Make the mode line inverse video if the entire line | |
2412 is made of mode lines. | |
2413 I.e. if this window is full width, | |
2414 or if it is the child of a full width window | |
2415 (which implies that that window is split side-by-side | |
2416 and the rest of this line is mode lines of the sibling windows). */ | |
769 | 2417 if (XFASTINT (w->width) == FRAME_WIDTH (f) |
2418 || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f)) | |
2419 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video; | |
277 | 2420 |
2421 #ifdef HAVE_X_WINDOWS | |
2422 /* I'm trying this out because I saw Unimpress use it, but it's | |
1124
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2423 possible that this may mess adversely with some window managers. -jla |
277 | 2424 |
1124
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2425 Wouldn't it be nice to use something like mode-line-format to |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2426 describe frame titles? -JimB */ |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2427 |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2428 /* Change the title of the frame to the name of the buffer displayed |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2429 in the currently selected window. Don't do this for minibuffer frames, |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2430 and don't do it when there's only one non-minibuffer frame. */ |
973
52267046b144
* xdisp.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Jim Blandy <jimb@redhat.com>
parents:
831
diff
changeset
|
2431 if (FRAME_X_P (f) |
769 | 2432 && ! FRAME_MINIBUF_ONLY_P (f) |
831 | 2433 && w == XWINDOW (f->selected_window)) |
1124
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2434 x_implicitly_set_name (f, (EQ (Fnext_frame (WINDOW_FRAME (w), Qnil), |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2435 WINDOW_FRAME (w)) |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2436 ? Qnil |
453c24f2bdaa
* xdisp.c (display_mode_line): If the only other frames are
Jim Blandy <jimb@redhat.com>
parents:
1017
diff
changeset
|
2437 : XBUFFER (w->buffer)->name), |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
2438 Qnil); |
277 | 2439 #endif |
2440 } | |
2441 | |
2442 /* Contribute ELT to the mode line for window W. | |
2443 How it translates into text depends on its data type. | |
2444 | |
2445 VPOS is the position of the mode line being displayed. | |
2446 | |
769 | 2447 HPOS is the position (absolute on frame) where this element's text |
277 | 2448 should start. The output is truncated automatically at the right |
2449 edge of window W. | |
2450 | |
2451 DEPTH is the depth in recursion. It is used to prevent | |
2452 infinite recursion here. | |
2453 | |
2454 MINENDCOL is the hpos before which the element may not end. | |
2455 The element is padded at the right with spaces if nec | |
2456 to reach this column. | |
2457 | |
2458 MAXENDCOL is the hpos past which this element may not extend. | |
2459 If MINENDCOL is > MAXENDCOL, MINENDCOL takes priority. | |
2460 (This is necessary to make nested padding and truncation work.) | |
2461 | |
2462 Returns the hpos of the end of the text generated by ELT. | |
2463 The next element will receive that value as its HPOS arg, | |
2464 so as to concatenate the elements. */ | |
2465 | |
2466 static int | |
2467 display_mode_element (w, vpos, hpos, depth, minendcol, maxendcol, elt) | |
2468 struct window *w; | |
2469 register int vpos, hpos; | |
2470 int depth; | |
2471 int minendcol; | |
2472 register int maxendcol; | |
2473 register Lisp_Object elt; | |
2474 { | |
2475 tail_recurse: | |
2476 if (depth > 10) | |
2477 goto invalid; | |
2478 | |
2479 depth++; | |
2480 | |
2481 #ifdef SWITCH_ENUM_BUG | |
2482 switch ((int) XTYPE (elt)) | |
2483 #else | |
2484 switch (XTYPE (elt)) | |
2485 #endif | |
2486 { | |
2487 case Lisp_String: | |
2488 { | |
2489 /* A string: output it and check for %-constructs within it. */ | |
2490 register unsigned char c; | |
2491 register unsigned char *this = XSTRING (elt)->data; | |
2492 | |
2493 while (hpos < maxendcol && *this) | |
2494 { | |
2495 unsigned char *last = this; | |
2496 while ((c = *this++) != '\0' && c != '%') | |
2497 ; | |
2498 if (this - 1 != last) | |
2499 { | |
2500 register int lim = --this - last + hpos; | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2501 hpos = display_string (w, vpos, last, -1, hpos, 0, hpos, |
277 | 2502 min (lim, maxendcol)); |
2503 } | |
2504 else /* c == '%' */ | |
2505 { | |
2506 register int spec_width = 0; | |
2507 | |
2508 /* We can't allow -ve args due to the "%-" construct */ | |
2509 /* Argument specifies minwidth but not maxwidth | |
2510 (maxwidth can be specified by | |
2511 (<negative-number> . <stuff>) mode-line elements) */ | |
2512 | |
2513 while ((c = *this++) >= '0' && c <= '9') | |
2514 { | |
2515 spec_width = spec_width * 10 + (c - '0'); | |
2516 } | |
2517 | |
2518 spec_width += hpos; | |
2519 if (spec_width > maxendcol) | |
2520 spec_width = maxendcol; | |
2521 | |
2522 if (c == 'M') | |
2523 hpos = display_mode_element (w, vpos, hpos, depth, | |
2524 spec_width, maxendcol, | |
2525 Vglobal_mode_string); | |
2526 else if (c != 0) | |
2527 hpos = display_string (w, vpos, | |
2528 decode_mode_spec (w, c, | |
2529 maxendcol - hpos), | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2530 -1, |
277 | 2531 hpos, 0, spec_width, maxendcol); |
2532 } | |
2533 } | |
2534 } | |
2535 break; | |
2536 | |
2537 case Lisp_Symbol: | |
2538 /* A symbol: process the value of the symbol recursively | |
2539 as if it appeared here directly. Avoid error if symbol void. | |
2540 Special case: if value of symbol is a string, output the string | |
2541 literally. */ | |
2542 { | |
2543 register Lisp_Object tem; | |
2544 tem = Fboundp (elt); | |
485 | 2545 if (!NILP (tem)) |
277 | 2546 { |
2547 tem = Fsymbol_value (elt); | |
2548 /* If value is a string, output that string literally: | |
2549 don't check for % within it. */ | |
2550 if (XTYPE (tem) == Lisp_String) | |
2551 hpos = display_string (w, vpos, XSTRING (tem)->data, | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2552 XSTRING (tem)->size, |
277 | 2553 hpos, 0, minendcol, maxendcol); |
2554 /* Give up right away for nil or t. */ | |
2555 else if (!EQ (tem, elt)) | |
2556 { elt = tem; goto tail_recurse; } | |
2557 } | |
2558 } | |
2559 break; | |
2560 | |
2561 case Lisp_Cons: | |
2562 { | |
2563 register Lisp_Object car, tem; | |
2564 | |
2565 /* A cons cell: three distinct cases. | |
2566 If first element is a string or a cons, process all the elements | |
2567 and effectively concatenate them. | |
2568 If first element is a negative number, truncate displaying cdr to | |
2569 at most that many characters. If positive, pad (with spaces) | |
2570 to at least that many characters. | |
2571 If first element is a symbol, process the cadr or caddr recursively | |
2572 according to whether the symbol's value is non-nil or nil. */ | |
2573 car = XCONS (elt)->car; | |
2574 if (XTYPE (car) == Lisp_Symbol) | |
2575 { | |
2576 tem = Fboundp (car); | |
2577 elt = XCONS (elt)->cdr; | |
2578 if (XTYPE (elt) != Lisp_Cons) | |
2579 goto invalid; | |
2580 /* elt is now the cdr, and we know it is a cons cell. | |
2581 Use its car if CAR has a non-nil value. */ | |
485 | 2582 if (!NILP (tem)) |
277 | 2583 { |
2584 tem = Fsymbol_value (car); | |
485 | 2585 if (!NILP (tem)) |
277 | 2586 { elt = XCONS (elt)->car; goto tail_recurse; } |
2587 } | |
2588 /* Symbol's value is nil (or symbol is unbound) | |
2589 Get the cddr of the original list | |
2590 and if possible find the caddr and use that. */ | |
2591 elt = XCONS (elt)->cdr; | |
485 | 2592 if (NILP (elt)) |
277 | 2593 break; |
2594 else if (XTYPE (elt) != Lisp_Cons) | |
2595 goto invalid; | |
2596 elt = XCONS (elt)->car; | |
2597 goto tail_recurse; | |
2598 } | |
2599 else if (XTYPE (car) == Lisp_Int) | |
2600 { | |
2601 register int lim = XINT (car); | |
2602 elt = XCONS (elt)->cdr; | |
2603 if (lim < 0) | |
2604 /* Negative int means reduce maximum width. | |
2605 DO NOT change MINENDCOL here! | |
2606 (20 -10 . foo) should truncate foo to 10 col | |
2607 and then pad to 20. */ | |
2608 maxendcol = min (maxendcol, hpos - lim); | |
2609 else if (lim > 0) | |
2610 { | |
2611 /* Padding specified. Don't let it be more than | |
2612 current maximum. */ | |
2613 lim += hpos; | |
2614 if (lim > maxendcol) | |
2615 lim = maxendcol; | |
2616 /* If that's more padding than already wanted, queue it. | |
2617 But don't reduce padding already specified even if | |
2618 that is beyond the current truncation point. */ | |
2619 if (lim > minendcol) | |
2620 minendcol = lim; | |
2621 } | |
2622 goto tail_recurse; | |
2623 } | |
2624 else if (XTYPE (car) == Lisp_String || XTYPE (car) == Lisp_Cons) | |
2625 { | |
2626 register int limit = 50; | |
2627 /* LIMIT is to protect against circular lists. */ | |
2628 while (XTYPE (elt) == Lisp_Cons && --limit > 0 | |
2629 && hpos < maxendcol) | |
2630 { | |
2631 hpos = display_mode_element (w, vpos, hpos, depth, | |
2632 hpos, maxendcol, | |
2633 XCONS (elt)->car); | |
2634 elt = XCONS (elt)->cdr; | |
2635 } | |
2636 } | |
2637 } | |
2638 break; | |
2639 | |
2640 default: | |
2641 invalid: | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2642 return (display_string (w, vpos, "*invalid*", -1, hpos, 0, |
277 | 2643 minendcol, maxendcol)); |
2644 } | |
2645 | |
2646 end: | |
2647 if (minendcol > hpos) | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2648 hpos = display_string (w, vpos, "", 0, hpos, 0, minendcol, -1); |
277 | 2649 return hpos; |
2650 } | |
2651 | |
2652 /* Return a string for the output of a mode line %-spec for window W, | |
2653 generated by character C and width MAXWIDTH. */ | |
2654 | |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
2655 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
|
2656 |
277 | 2657 static char * |
2658 decode_mode_spec (w, c, maxwidth) | |
2659 struct window *w; | |
2660 register char c; | |
2661 register int maxwidth; | |
2662 { | |
2663 Lisp_Object obj = Qnil; | |
769 | 2664 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
2665 char *decode_mode_spec_buf = (char *) FRAME_TEMP_GLYPHS (f)->total_contents; | |
277 | 2666 |
769 | 2667 if (maxwidth > FRAME_WIDTH (f)) |
2668 maxwidth = FRAME_WIDTH (f); | |
277 | 2669 |
2670 switch (c) | |
2671 { | |
2672 case 'b': | |
2673 obj = current_buffer->name; | |
2674 #if 0 | |
2675 if (maxwidth >= 3 && XSTRING (obj)->size > maxwidth) | |
2676 { | |
2677 bcopy (XSTRING (obj)->data, decode_mode_spec_buf, maxwidth - 1); | |
2678 decode_mode_spec_buf[maxwidth - 1] = '\\'; | |
2679 decode_mode_spec_buf[maxwidth] = '\0'; | |
2680 return decode_mode_spec_buf; | |
2681 } | |
2682 #endif | |
2683 break; | |
2684 | |
2685 case 'f': | |
2686 obj = current_buffer->filename; | |
2687 #if 0 | |
485 | 2688 if (NILP (obj)) |
277 | 2689 return "[none]"; |
2690 else if (XTYPE (obj) == Lisp_String && XSTRING (obj)->size > maxwidth) | |
2691 { | |
2692 bcopy ("...", decode_mode_spec_buf, 3); | |
2693 bcopy (XSTRING (obj)->data + XSTRING (obj)->size - maxwidth + 3, | |
2694 decode_mode_spec_buf + 3, maxwidth - 3); | |
2695 return decode_mode_spec_buf; | |
2696 } | |
2697 #endif | |
2698 break; | |
2699 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2700 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2701 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2702 int startpos = marker_position (w->start); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2703 int line, linepos, topline; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2704 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2705 Lisp_Object tem; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2706 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2707 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2708 /* 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
|
2709 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2710 if (EQ (w->base_line_pos, w->buffer)) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2711 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2712 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2713 /* If the buffer is very big, don't waste time. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2714 if (ZV - BEGV > line_number_display_limit) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2715 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2716 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2717 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2718 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2719 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2720 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2721 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2722 && !NILP (w->base_line_pos) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2723 && 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
|
2724 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2725 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2726 linepos = XFASTINT (w->base_line_pos); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2727 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2728 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2729 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2730 line = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2731 linepos = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2732 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2733 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2734 /* 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
|
2735 nlines = display_count_lines (linepos, startpos, startpos, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2736 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2737 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2738 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2739 /* 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
|
2740 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
|
2741 "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
|
2742 go back past it. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2743 if (startpos == BEGV) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2744 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2745 XFASTINT (w->base_line_number) = topline; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2746 XFASTINT (w->base_line_pos) = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2747 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2748 else if (nlines < height + 25 || nlines > height * 3 + 50 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2749 || linepos == BEGV) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2750 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2751 int limit = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2752 int position; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2753 int distance = (height * 2 + 30) * 200; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2754 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2755 if (startpos - distance > limit) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2756 limit = startpos - distance; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2757 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2758 nlines = display_count_lines (startpos, limit, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2759 -(height * 2 + 30), |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2760 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2761 /* 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
|
2762 200 chars per line, |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2763 give up on line numbers for this window. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2764 if (position == startpos - distance) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2765 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2766 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2767 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2768 return "??"; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2769 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2770 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2771 XFASTINT (w->base_line_number) = topline - nlines; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2772 XFASTINT (w->base_line_pos) = position; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2773 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2774 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2775 /* 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
|
2776 nlines = display_count_lines (startpos, PT, PT, &junk); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2777 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2778 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2779 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2780 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2781 /* Make the string to show. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2782 sprintf (decode_mode_spec_buf, "%d", topline + nlines); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2783 return decode_mode_spec_buf; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2784 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2785 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2786 |
277 | 2787 case 'm': |
2788 obj = current_buffer->mode_name; | |
2789 break; | |
2790 | |
2791 case 'n': | |
2792 if (BEGV > BEG || ZV < Z) | |
2793 return " Narrow"; | |
2794 break; | |
2795 | |
2796 case '*': | |
485 | 2797 if (!NILP (current_buffer->read_only)) |
277 | 2798 return "%"; |
2799 if (MODIFF > current_buffer->save_modified) | |
2800 return "*"; | |
2801 return "-"; | |
2802 | |
2803 case 's': | |
2804 /* status of process */ | |
2805 obj = Fget_buffer_process (Fcurrent_buffer ()); | |
485 | 2806 if (NILP (obj)) |
277 | 2807 return "no process"; |
2808 obj = Fsymbol_name (Fprocess_status (obj)); | |
2809 break; | |
2810 | |
2811 case 'p': | |
2812 { | |
2813 int pos = marker_position (w->start); | |
2814 int total = ZV - BEGV; | |
2815 | |
2816 if (XFASTINT (w->window_end_pos) <= Z - ZV) | |
2817 { | |
2818 if (pos <= BEGV) | |
2819 return "All"; | |
2820 else | |
2821 return "Bottom"; | |
2822 } | |
2823 else if (pos <= BEGV) | |
2824 return "Top"; | |
2825 else | |
2826 { | |
2827 total = ((pos - BEGV) * 100 + total - 1) / total; | |
2828 /* We can't normally display a 3-digit number, | |
2829 so get us a 2-digit number that is close. */ | |
2830 if (total == 100) | |
2831 total = 99; | |
2832 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
2833 return decode_mode_spec_buf; | |
2834 } | |
2835 } | |
2836 | |
2837 case '%': | |
2838 return "%"; | |
2839 | |
2840 case '[': | |
2841 { | |
2842 int i; | |
2843 char *p; | |
2844 | |
2845 if (command_loop_level > 5) | |
2846 return "[[[... "; | |
2847 p = decode_mode_spec_buf; | |
2848 for (i = 0; i < command_loop_level; i++) | |
2849 *p++ = '['; | |
2850 *p = 0; | |
2851 return decode_mode_spec_buf; | |
2852 } | |
2853 | |
2854 case ']': | |
2855 { | |
2856 int i; | |
2857 char *p; | |
2858 | |
2859 if (command_loop_level > 5) | |
2860 return " ...]]]"; | |
2861 p = decode_mode_spec_buf; | |
2862 for (i = 0; i < command_loop_level; i++) | |
2863 *p++ = ']'; | |
2864 *p = 0; | |
2865 return decode_mode_spec_buf; | |
2866 } | |
2867 | |
2868 case '-': | |
2869 { | |
2870 register char *p; | |
2871 register int i; | |
2872 | |
2873 if (maxwidth < sizeof (lots_of_dashes)) | |
2874 return lots_of_dashes; | |
2875 else | |
2876 { | |
2877 for (p = decode_mode_spec_buf, i = maxwidth; i > 0; i--) | |
2878 *p++ = '-'; | |
2879 *p = '\0'; | |
2880 } | |
2881 return decode_mode_spec_buf; | |
2882 } | |
2883 } | |
2884 | |
2885 if (XTYPE (obj) == Lisp_String) | |
2886 return (char *) XSTRING (obj)->data; | |
2887 else | |
2888 return ""; | |
2889 } | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2890 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2891 /* Count up to N lines starting from FROM. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2892 But don't go beyond LIMIT. |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2893 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
|
2894 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
|
2895 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2896 static int |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2897 display_count_lines (from, limit, n, pos_ptr) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2898 int from, limit, n; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2899 int *pos_ptr; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2900 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2901 int oldbegv = BEGV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2902 int oldzv = ZV; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2903 int shortage = 0; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2904 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2905 if (limit < from) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2906 BEGV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2907 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2908 ZV = limit; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2909 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2910 *pos_ptr = scan_buffer ('\n', from, n, &shortage); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2911 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2912 ZV = oldzv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2913 BEGV = oldbegv; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2914 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2915 if (n < 0) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2916 /* 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
|
2917 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
|
2918 return - n - shortage - (*pos_ptr != limit); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2919 return n - shortage; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
2920 } |
277 | 2921 |
2922 /* Display STRING on one line of window W, starting at HPOS. | |
2923 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
|
2924 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
|
2925 LENGTH is the length of STRING, or -1 meaning STRING is null-terminated. |
277 | 2926 |
2927 TRUNCATE is GLYPH to display at end if truncated. Zero for none. | |
2928 | |
2929 MINCOL is the first column ok to end at. (Pad with spaces to this col.) | |
2930 MAXCOL is the last column ok to end at. Truncate here. | |
2931 -1 for MINCOL or MAXCOL means no explicit minimum or maximum. | |
769 | 2932 Both count from the left edge of the frame, as does HPOS. |
277 | 2933 The right edge of W is an implicit maximum. |
2934 If TRUNCATE is nonzero, the implicit maximum is one column before the edge. | |
2935 | |
2936 Returns ending hpos */ | |
2937 | |
2938 static int | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2939 display_string (w, vpos, string, length, hpos, truncate, mincol, maxcol) |
277 | 2940 struct window *w; |
2941 unsigned char *string; | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2942 int length; |
277 | 2943 int vpos, hpos; |
2944 GLYPH truncate; | |
2945 int mincol, maxcol; | |
2946 { | |
2947 register int c; | |
2948 register GLYPH *p1; | |
2949 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
|
2950 int tab_width = XINT (XBUFFER (w->buffer)->tab_width); |
277 | 2951 register GLYPH *start; |
2952 register GLYPH *end; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2953 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
|
2954 struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f); |
277 | 2955 GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos; |
2956 int window_width = XFASTINT (w->width); | |
2957 | |
2958 /* Use the standard display table, not the window's display table. | |
2959 We don't want the mode line in rot13. */ | |
2960 register struct Lisp_Vector *dp = 0; | |
2961 | |
2962 if (XTYPE (Vstandard_display_table) == Lisp_Vector | |
2963 && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE) | |
2964 dp = XVECTOR (Vstandard_display_table); | |
2965 | |
2324
24cd3df6f184
(display_string, display_text_line): Allow tab_width up to 1000.
Richard M. Stallman <rms@gnu.org>
parents:
2303
diff
changeset
|
2966 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
277 | 2967 |
2968 p1 = p1start; | |
2969 start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left); | |
2970 end = start + window_width - (truncate != 0); | |
2971 | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2972 if ((window_width + XFASTINT (w->left)) != FRAME_WIDTH (f)) |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2973 { |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2974 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
|
2975 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2976 int i; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2977 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
2978 for (i = 0; i < VERTICAL_SCROLL_BAR_WIDTH; i++) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2979 *end-- = ' '; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2980 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2981 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2982 *end-- = '|'; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
2983 } |
277 | 2984 |
2985 if (maxcol >= 0 && end - desired_glyphs->glyphs[vpos] > maxcol) | |
2986 end = desired_glyphs->glyphs[vpos] + maxcol; | |
2987 if (maxcol >= 0 && mincol > maxcol) | |
2988 mincol = maxcol; | |
2989 | |
2990 while (p1 < end) | |
2991 { | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2992 if (length == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2993 break; |
277 | 2994 c = *string++; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2995 /* Specified length. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2996 if (length >= 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2997 length--; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2998 /* Unspecified length (null-terminated string). */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
2999 else if (c == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3000 break; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3001 |
277 | 3002 if (c >= 040 && c < 0177 |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
3003 && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector)) |
277 | 3004 { |
3005 if (p1 >= start) | |
3006 *p1 = c; | |
3007 p1++; | |
3008 } | |
3009 else if (c == '\t') | |
3010 { | |
3011 do | |
3012 { | |
3013 if (p1 >= start && p1 < end) | |
3014 *p1 = SPACEGLYPH; | |
3015 p1++; | |
3016 } | |
3017 while ((p1 - start + hscroll - (hscroll > 0)) % tab_width); | |
3018 } | |
2065
32afcdd08efe
(copy_rope): Expect FROM to be a vector.
Richard M. Stallman <rms@gnu.org>
parents:
1992
diff
changeset
|
3019 else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector) |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
3020 p1 = copy_rope (p1, start, DISP_CHAR_VECTOR (dp, c), 0); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
3021 else if (c < 0200 && ! NILP (buffer_defaults.ctl_arrow)) |
277 | 3022 { |
3023 if (p1 >= start) | |
3024 *p1 = (dp && XTYPE (DISP_CTRL_GLYPH (dp)) == Lisp_Int | |
3025 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'); | |
3026 p1++; | |
368 | 3027 if (p1 >= start && p1 < end) |
277 | 3028 *p1 = c ^ 0100; |
3029 p1++; | |
3030 } | |
3031 else | |
3032 { | |
3033 if (p1 >= start) | |
3034 *p1 = (dp && XTYPE (DISP_ESCAPE_GLYPH (dp)) == Lisp_Int | |
3035 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'); | |
3036 p1++; | |
368 | 3037 if (p1 >= start && p1 < end) |
277 | 3038 *p1 = (c >> 6) + '0'; |
3039 p1++; | |
368 | 3040 if (p1 >= start && p1 < end) |
277 | 3041 *p1 = (7 & (c >> 3)) + '0'; |
3042 p1++; | |
368 | 3043 if (p1 >= start && p1 < end) |
277 | 3044 *p1 = (7 & c) + '0'; |
3045 p1++; | |
3046 } | |
3047 } | |
3048 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
3049 if (c && length > 0) |
277 | 3050 { |
3051 p1 = end; | |
3052 if (truncate) *p1++ = truncate; | |
3053 } | |
3054 else if (mincol >= 0) | |
3055 { | |
3056 end = desired_glyphs->glyphs[vpos] + mincol; | |
3057 while (p1 < end) | |
3058 *p1++ = SPACEGLYPH; | |
3059 } | |
3060 | |
3061 { | |
3062 register int len = p1 - desired_glyphs->glyphs[vpos]; | |
3063 | |
3064 if (len > desired_glyphs->used[vpos]) | |
3065 desired_glyphs->used[vpos] = len; | |
3066 desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0; | |
3067 | |
3068 return len; | |
3069 } | |
3070 } | |
3071 | |
3072 void | |
3073 syms_of_xdisp () | |
3074 { | |
3075 staticpro (&last_arrow_position); | |
3076 staticpro (&last_arrow_string); | |
3077 last_arrow_position = Qnil; | |
3078 last_arrow_string = Qnil; | |
3079 | |
3080 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, | |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
3081 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 3082 Vglobal_mode_string = Qnil; |
3083 | |
3084 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
3085 "Marker for where to display an arrow on top of the buffer text.\n\ | |
3086 This must be the beginning of a line in order to work.\n\ | |
3087 See also `overlay-arrow-string'."); | |
3088 Voverlay_arrow_position = Qnil; | |
3089 | |
3090 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
3091 "String to display as an arrow. See also `overlay-arrow-position'."); | |
3092 Voverlay_arrow_string = Qnil; | |
3093 | |
3094 DEFVAR_INT ("scroll-step", &scroll_step, | |
3095 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 3096 If that fails to bring point back on frame, point is centered instead.\n\ |
3097 If this is zero, point is always centered after it moves off frame."); | |
277 | 3098 |
3099 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); | |
3100 | |
3101 DEFVAR_BOOL ("truncate-partial-width-windows", | |
3102 &truncate_partial_width_windows, | |
769 | 3103 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 3104 truncate_partial_width_windows = 1; |
3105 | |
3106 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
3107 "*Non-nil means use inverse video for the mode line."); | |
3108 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3109 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
3110 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
|
3111 "*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
|
3112 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
|
3113 |
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
3114 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
|
3115 "*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
|
3116 highlight_nonselected_windows = 1; |
277 | 3117 } |
3118 | |
3119 /* initialize the window system */ | |
3120 init_xdisp () | |
3121 { | |
3122 Lisp_Object root_window; | |
3123 #ifndef COMPILER_REGISTER_BUG | |
3124 register | |
3125 #endif /* COMPILER_REGISTER_BUG */ | |
3126 struct window *mini_w; | |
3127 | |
3128 this_line_bufpos = 0; | |
3129 | |
3130 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
|
3131 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 3132 |
3133 echo_area_glyphs = 0; | |
3134 previous_echo_glyphs = 0; | |
3135 | |
3136 if (!noninteractive) | |
3137 { | |
769 | 3138 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
277 | 3139 XFASTINT (XWINDOW (root_window)->top) = 0; |
769 | 3140 set_window_height (root_window, FRAME_HEIGHT (f) - 1, 0); |
3141 XFASTINT (mini_w->top) = FRAME_HEIGHT (f) - 1; | |
277 | 3142 set_window_height (minibuf_window, 1, 0); |
3143 | |
769 | 3144 XFASTINT (XWINDOW (root_window)->width) = FRAME_WIDTH (f); |
3145 XFASTINT (mini_w->width) = FRAME_WIDTH (f); | |
277 | 3146 } |
3147 } |