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