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