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