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