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