Mercurial > emacs
annotate src/xdisp.c @ 26255:4ebced8747b7
(append_space): Return non-zero if space was appended.
(display_line): Set charpos of first glyph to -1 only if that
glyph is the space added by append_glyph.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Sun, 31 Oct 1999 02:01:25 +0000 |
parents | 47d54b67bce2 |
children | 4ca4f3f6c4a0 |
rev | line source |
---|---|
277 | 1 /* Display generation from window structure and buffer text. |
25012 | 2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99 |
3 Free Software Foundation, Inc. | |
277 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 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
|
9 the Free Software Foundation; either version 2, or (at your option) |
277 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14178
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
277 | 21 |
25012 | 22 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>. |
23 | |
24 Redisplay. | |
25 | |
26 Emacs separates the task of updating the display from code | |
27 modifying global state, e.g. buffer text. This way functions | |
28 operating on buffers don't also have to be concerned with updating | |
29 the display. | |
30 | |
31 Updating the display is triggered by the Lisp interpreter when it | |
32 decides it's time to do it. This is done either automatically for | |
33 you as part of the interpreter's command loop or as the result of | |
34 calling Lisp functions like `sit-for'. The C function `redisplay' | |
35 in xdisp.c is the only entry into the inner redisplay code. (Or, | |
36 let's say almost---see the the description of direct update | |
37 operations, below.). | |
38 | |
39 The following diagram shows how redisplay code is invoked. As you | |
40 can see, Lisp calls redisplay and vice versa. Under window systems | |
41 like X, some portions of the redisplay code are also called | |
42 asynchronously during mouse movement or expose events. It is very | |
43 important that these code parts do NOT use the C library (malloc, | |
44 free) because many C libraries under Unix are not reentrant. They | |
45 may also NOT call functions of the Lisp interpreter which could | |
46 change the interpreter's state. If you don't follow these rules, | |
47 you will encounter bugs which are very hard to explain. | |
48 | |
49 (Direct functions, see below) | |
50 direct_output_for_insert, | |
51 direct_forward_char (dispnew.c) | |
52 +---------------------------------+ | |
53 | | | |
54 | V | |
55 +--------------+ redisplay() +----------------+ | |
56 | Lisp machine |---------------->| Redisplay code |<--+ | |
57 +--------------+ (xdisp.c) +----------------+ | | |
58 ^ | | | |
59 +----------------------------------+ | | |
60 Don't use this path when called | | |
61 asynchronously! | | |
62 | | |
63 expose_window (asynchronous) | | |
64 | | |
65 X expose events -----+ | |
66 | |
67 What does redisplay? Obviously, it has to figure out somehow what | |
68 has been changed since the last time the display has been updated, | |
69 and to make these changes visible. Preferably it would do that in | |
70 a moderately intelligent way, i.e. fast. | |
71 | |
72 Changes in buffer text can be deduced from window and buffer | |
73 structures, and from some global variables like `beg_unchanged' and | |
74 `end_unchanged'. The contents of the display are additionally | |
75 recorded in a `glyph matrix', a two-dimensional matrix of glyph | |
76 structures. Each row in such a matrix corresponds to a line on the | |
77 display, and each glyph in a row corresponds to a column displaying | |
78 a character, an image, or what else. This matrix is called the | |
79 `current glyph matrix' or `current matrix' in redisplay | |
80 terminology. | |
81 | |
82 For buffer parts that have been changed since the last update, a | |
83 second glyph matrix is constructed, the so called `desired glyph | |
84 matrix' or short `desired matrix'. Current and desired matrix are | |
85 then compared to find a cheap way to update the display, e.g. by | |
86 reusing part of the display by scrolling lines. | |
87 | |
88 | |
89 Direct operations. | |
90 | |
91 You will find a lot of of redisplay optimizations when you start | |
92 looking at the innards of redisplay. The overall goal of all these | |
93 optimizations is to make redisplay fast because it is done | |
94 frequently. | |
95 | |
96 Two optimizations are not found in xdisp.c. These are the direct | |
97 operations mentioned above. As the name suggests they follow a | |
98 different principle than the rest of redisplay. Instead of | |
99 building a desired matrix and then comparing it with the current | |
100 display, they perform their actions directly on the display and on | |
101 the current matrix. | |
102 | |
103 One direct operation updates the display after one character has | |
104 been entered. The other one moves the cursor by one position | |
105 forward or backward. You find these functions under the names | |
106 `direct_output_for_insert' and `direct_output_forward_char' in | |
107 dispnew.c. | |
108 | |
109 | |
110 Desired matrices. | |
111 | |
112 Desired matrices are always built per Emacs window. The function | |
113 `display_line' is the central function to look at if you are | |
114 interested. It constructs one row in a desired matrix given an | |
115 iterator structure containing both a buffer position and a | |
116 description of the environment in which the text is to be | |
117 displayed. But this is too early, read on. | |
118 | |
119 Characters and pixmaps displayed for a range of buffer text depend | |
120 on various settings of buffers and windows, on overlays and text | |
121 properties, on display tables, on selective display. The good news | |
122 is that all this hairy stuff is hidden behind a small set of | |
123 interface functions taking a iterator structure (struct it) | |
124 argument. | |
125 | |
126 Iteration over things to be be displayed is then simple. It is | |
127 started by initializing an iterator with a call to init_iterator | |
128 (or init_string_iterator for that matter). Calls to | |
129 get_next_display_element fill the iterator structure with relevant | |
130 information about the next thing to display. Calls to | |
131 set_iterator_to_next move the iterator to the next thing. | |
132 | |
133 Besides this, an iterator also contains information about the | |
134 display environment in which glyphs for display elements are to be | |
135 produced. It has fields for the width and height of the display, | |
136 the information whether long lines are truncated or continued, a | |
137 current X and Y position, and lots of other stuff you can better | |
138 see in dispextern.h. | |
139 | |
140 Glyphs in a desired matrix are normally constructed in a loop | |
141 calling get_next_display_element and then produce_glyphs. The call | |
142 to produce_glyphs will fill the iterator structure with pixel | |
143 information about the element being displayed and at the same time | |
144 produce glyphs for it. If the display element fits on the line | |
145 being displayed, set_iterator_to_next is called next, otherwise the | |
146 glyphs produced are discarded. | |
147 | |
148 | |
149 Frame matrices. | |
150 | |
151 That just couldn't be all, could it? What about terminal types not | |
152 supporting operations on sub-windows of the screen? To update the | |
153 display on such a terminal, window-based glyph matrices are not | |
154 well suited. To be able to reuse part of the display (scrolling | |
155 lines up and down), we must instead have a view of the whole | |
156 screen. This is what `frame matrices' are for. They are a trick. | |
157 | |
158 Frames on terminals like above have a glyph pool. Windows on such | |
159 a frame sub-allocate their glyph memory from their frame's glyph | |
160 pool. The frame itself is given its own glyph matrices. By | |
161 coincidence---or maybe something else---rows in window glyph | |
162 matrices are slices of corresponding rows in frame matrices. Thus | |
163 writing to window matrices implicitly updates a frame matrix which | |
164 provides us with the view of the whole screen that we originally | |
165 wanted to have without having to move many bytes around. To be | |
166 honest, there is a little bit more done, but not much more. If you | |
167 plan to extend that code, take a look at dispnew.c. The function | |
168 build_frame_matrix is a good starting point. */ | |
277 | 169 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4423
diff
changeset
|
170 #include <config.h> |
277 | 171 #include <stdio.h> |
172 #include "lisp.h" | |
769 | 173 #include "frame.h" |
277 | 174 #include "window.h" |
175 #include "termchar.h" | |
176 #include "dispextern.h" | |
177 #include "buffer.h" | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
178 #include "charset.h" |
277 | 179 #include "indent.h" |
180 #include "commands.h" | |
181 #include "macros.h" | |
182 #include "disptab.h" | |
1718
f80c1f73f5b9
* xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents:
1656
diff
changeset
|
183 #include "termhooks.h" |
4386
abd79e187610
(try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
3937
diff
changeset
|
184 #include "intervals.h" |
12081 | 185 #include "keyboard.h" |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
186 #include "coding.h" |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
187 #include "process.h" |
21514 | 188 #include "region-cache.h" |
189 | |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21748
diff
changeset
|
190 #ifdef HAVE_X_WINDOWS |
21514 | 191 #include "xterm.h" |
192 #endif | |
277 | 193 |
25012 | 194 #define min(a, b) ((a) < (b) ? (a) : (b)) |
195 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
196 | |
197 #define INFINITY 10000000 | |
198 | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
199 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
200 extern void set_frame_menubar (); |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
201 extern int pending_menu_activation; |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
202 #endif |
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
203 |
277 | 204 extern int interrupt_input; |
205 extern int command_loop_level; | |
206 | |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
207 extern int minibuffer_auto_raise; |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
208 |
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
|
209 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
|
210 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
211 extern Lisp_Object Voverriding_local_map; |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
212 extern Lisp_Object Voverriding_local_map_menu_flag; |
25012 | 213 extern Lisp_Object Qmenu_item; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
214 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
215 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
216 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
217 Lisp_Object Qredisplay_end_trigger_functions; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
218 Lisp_Object Qinhibit_point_motion_hooks; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
219 Lisp_Object QCeval, Qwhen, QCfile; |
25012 | 220 Lisp_Object Qfontified; |
221 | |
222 /* Functions called to fontify regions of text. */ | |
223 | |
224 Lisp_Object Vfontification_functions; | |
225 Lisp_Object Qfontification_functions; | |
226 | |
25543 | 227 /* Non-zero means draw tool bar buttons raised when the mouse moves |
25012 | 228 over them. */ |
229 | |
25543 | 230 int auto_raise_tool_bar_buttons_p; |
231 | |
232 /* Margin around tool bar buttons in pixels. */ | |
233 | |
234 int tool_bar_button_margin; | |
235 | |
236 /* Thickness of shadow to draw around tool bar buttons. */ | |
237 | |
238 int tool_bar_button_relief; | |
239 | |
240 /* Non-zero means automatically resize tool-bars so that all tool-bar | |
25012 | 241 items are visible, and no blank lines remain. */ |
242 | |
25543 | 243 int auto_resize_tool_bars_p; |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
244 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
245 /* Non-nil means don't actually do any redisplay. */ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
246 |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
247 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
248 |
25012 | 249 /* Names of text properties relevant for redisplay. */ |
250 | |
251 Lisp_Object Qdisplay, Qrelative_width, Qwidth, Qalign_to; | |
252 extern Lisp_Object Qface, Qinvisible, Qimage; | |
253 | |
254 /* Symbols used in text property values. */ | |
255 | |
256 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; | |
257 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qheight, Qraise; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
258 Lisp_Object Qmargin; |
25012 | 259 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
260 /* Non-nil means highlight trailing whitespace. */ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
261 |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
262 Lisp_Object Vshow_trailing_whitespace; |
25012 | 263 |
264 /* Name of the face used to highlight trailing whitespace. */ | |
265 | |
266 Lisp_Object Qtrailing_whitespace; | |
267 | |
268 /* The symbol `image' which is the car of the lists used to represent | |
269 images in Lisp. */ | |
270 | |
271 Lisp_Object Qimage; | |
272 | |
273 /* Non-zero means print newline to stdout before next mini-buffer | |
274 message. */ | |
277 | 275 |
276 int noninteractive_need_newline; | |
277 | |
25012 | 278 /* Non-zero means print newline to message log before next message. */ |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
279 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
280 static int message_log_need_newline; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
281 |
25012 | 282 |
283 /* The buffer position of the first character appearing entirely or | |
284 partially on the line of the selected window which contains the | |
285 cursor; <= 0 if not known. Set by set_cursor_from_row, used for | |
286 redisplay optimization in redisplay_internal. */ | |
287 | |
288 static struct text_pos this_line_start_pos; | |
289 | |
290 /* Number of characters past the end of the line above, including the | |
291 terminating newline. */ | |
292 | |
293 static struct text_pos this_line_end_pos; | |
294 | |
295 /* The vertical positions and the height of this line. */ | |
296 | |
277 | 297 static int this_line_vpos; |
25012 | 298 static int this_line_y; |
299 static int this_line_pixel_height; | |
300 | |
301 /* X position at which this display line starts. Usually zero; | |
302 negative if first character is partially visible. */ | |
303 | |
304 static int this_line_start_x; | |
305 | |
306 /* Buffer that this_line_.* variables are referring to. */ | |
307 | |
277 | 308 static struct buffer *this_line_buffer; |
309 | |
25012 | 310 /* Nonzero means truncate lines in all windows less wide than the |
311 frame. */ | |
312 | |
277 | 313 int truncate_partial_width_windows; |
314 | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
315 /* A flag to control how to display unibyte 8-bit character. */ |
25012 | 316 |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
317 int unibyte_display_via_language_environment; |
25012 | 318 |
319 /* Nonzero means we have more than one non-mini-buffer-only frame. | |
320 Not guaranteed to be accurate except while parsing | |
321 frame-title-format. */ | |
322 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
323 int multiple_frames; |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
324 |
277 | 325 Lisp_Object Vglobal_mode_string; |
326 | |
327 /* Marker for where to display an arrow on top of the buffer text. */ | |
25012 | 328 |
277 | 329 Lisp_Object Voverlay_arrow_position; |
330 | |
25012 | 331 /* String to display for the arrow. Only used on terminal frames. */ |
332 | |
277 | 333 Lisp_Object Voverlay_arrow_string; |
334 | |
25012 | 335 /* Values of those variables at last redisplay. However, if |
336 Voverlay_arrow_position is a marker, last_arrow_position is its | |
337 numerical position. */ | |
338 | |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
339 static Lisp_Object last_arrow_position, last_arrow_string; |
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
340 |
25012 | 341 /* Like mode-line-format, but for the title bar on a visible frame. */ |
342 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
343 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
|
344 |
25012 | 345 /* Like mode-line-format, but for the title bar on an iconified frame. */ |
346 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
347 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
|
348 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
349 /* List of functions to call when a window's size changes. These |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
350 functions get one arg, a frame on which one or more windows' sizes |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
351 have changed. */ |
25012 | 352 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
353 static Lisp_Object Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
354 |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
355 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
|
356 |
277 | 357 /* Nonzero if overlay arrow has been displayed once in this window. */ |
25012 | 358 |
277 | 359 static int overlay_arrow_seen; |
360 | |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
361 /* Nonzero means highlight the region even in nonselected windows. */ |
25012 | 362 |
363 int highlight_nonselected_windows; | |
364 | |
365 /* If cursor motion alone moves point off frame, try scrolling this | |
366 many lines up or down if that will bring it back. */ | |
367 | |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
368 static int scroll_step; |
277 | 369 |
25012 | 370 /* Non-0 means scroll just far enough to bring point back on the |
371 screen, when appropriate. */ | |
372 | |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
373 static int scroll_conservatively; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
374 |
25012 | 375 /* Recenter the window whenever point gets within this many lines of |
376 the top or bottom of the window. This value is translated into a | |
377 pixel value by multiplying it with CANON_Y_UNIT, which means that | |
378 there is really a fixed pixel height scroll margin. */ | |
379 | |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
380 int scroll_margin; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
381 |
25012 | 382 /* Number of windows showing the buffer of the selected window (or |
383 another buffer with the same base buffer). keyboard.c refers to | |
384 this. */ | |
385 | |
277 | 386 int buffer_shared; |
387 | |
25012 | 388 /* Vector containing glyphs for an ellipsis `...'. */ |
389 | |
390 static Lisp_Object default_invis_vector[3]; | |
391 | |
392 /* Nonzero means display mode line highlighted. */ | |
393 | |
277 | 394 int mode_line_inverse_video; |
395 | |
25012 | 396 /* Prompt to display in front of the mini-buffer contents. */ |
397 | |
7951
e609577aa2f3
minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
7933
diff
changeset
|
398 Lisp_Object minibuf_prompt; |
277 | 399 |
25012 | 400 /* Width of current mini-buffer prompt. Only set after display_line |
401 of the line that contains the prompt. */ | |
402 | |
277 | 403 int minibuf_prompt_width; |
25012 | 404 int minibuf_prompt_pixel_width; |
405 | |
406 /* This is the window where the echo area message was displayed. It | |
407 is always a mini-buffer window, but it may not be the same window | |
408 currently active as a mini-buffer. */ | |
409 | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
410 Lisp_Object echo_area_window; |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
411 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
412 /* List of pairs (MESSAGE . MULTIBYTE). The function save_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
413 pushes the current message and the value of |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
414 message_enable_multibyte on the stack, the function restore_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
415 pops the stack and displays MESSAGE again. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
416 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
417 Lisp_Object Vmessage_stack; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
418 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
419 /* Nonzero means multibyte characters were enabled when the echo area |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
420 message was specified. */ |
25012 | 421 |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
422 int message_enable_multibyte; |
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
423 |
25012 | 424 /* True if we should redraw the mode lines on the next redisplay. */ |
425 | |
277 | 426 int update_mode_lines; |
427 | |
25012 | 428 /* Nonzero if window sizes or contents have changed since last |
429 redisplay that finished */ | |
430 | |
277 | 431 int windows_or_buffers_changed; |
432 | |
25012 | 433 /* Nonzero after display_mode_line if %l was used and it displayed a |
434 line number. */ | |
435 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
436 int line_number_displayed; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
437 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
438 /* Maximum buffer size for which to display line numbers. */ |
25012 | 439 |
11719
9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents:
11649
diff
changeset
|
440 static int line_number_display_limit; |
10393 | 441 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
442 /* line width to consider when repostioning for line number display */ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
443 |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
444 static int line_number_display_limit_width; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
445 |
25012 | 446 /* Number of lines to keep in the message log buffer. t means |
447 infinite. nil means don't log at all. */ | |
448 | |
10393 | 449 Lisp_Object Vmessage_log_max; |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
450 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
451 /* Current, index 0, and last displayed echo area message. Either |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
452 buffers from echo_buffers, or nil to indicate no message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
453 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
454 Lisp_Object echo_area_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
455 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
456 /* The buffers referenced from echo_area_buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
457 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
458 static Lisp_Object echo_buffer[2]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
459 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
460 /* A vector saved used in with_area_buffer to reduce consing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
461 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
462 static Lisp_Object Vwith_echo_area_save_vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
463 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
464 /* Non-zero means display_echo_area should display the last echo area |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
465 message again. Set by redisplay_preserve_echo_area. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
466 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
467 static int display_last_displayed_message_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
468 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
469 /* Nonzero if echo area is being used by print; zero if being used by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
470 message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
471 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
472 int message_buf_print; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
473 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
474 /* Maximum height for resizing mini-windows. Either a float |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
475 specifying a fraction of the available height, or an integer |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
476 specifying a number of lines. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
477 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
478 static Lisp_Object Vmax_mini_window_height; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
479 |
25012 | 480 /* A scratch glyph row with contents used for generating truncation |
481 glyphs. Also used in direct_output_for_insert. */ | |
482 | |
483 #define MAX_SCRATCH_GLYPHS 100 | |
484 struct glyph_row scratch_glyph_row; | |
485 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS]; | |
486 | |
487 /* Ascent and height of the last line processed by move_it_to. */ | |
488 | |
489 static int last_max_ascent, last_height; | |
490 | |
491 /* The maximum distance to look ahead for text properties. Values | |
492 that are too small let us call compute_char_face and similar | |
493 functions too often which is expensive. Values that are too large | |
494 let us call compute_char_face and alike too often because we | |
495 might not be interested in text properties that far away. */ | |
496 | |
497 #define TEXT_PROP_DISTANCE_LIMIT 100 | |
498 | |
499 /* Non-zero means print traces of redisplay if compiled with | |
500 GLYPH_DEBUG != 0. */ | |
501 | |
502 #if GLYPH_DEBUG | |
503 int trace_redisplay_p; | |
504 #endif | |
505 | |
506 /* Value returned from text property handlers (see below). */ | |
507 | |
508 enum prop_handled | |
509 { | |
510 HANDLED_NORMALLY, | |
511 HANDLED_RECOMPUTE_PROPS, | |
512 HANDLED_OVERLAY_STRING_CONSUMED, | |
513 HANDLED_RETURN | |
514 }; | |
515 | |
516 /* A description of text properties that redisplay is interested | |
517 in. */ | |
518 | |
519 struct props | |
520 { | |
521 /* The name of the property. */ | |
522 Lisp_Object *name; | |
523 | |
524 /* A unique index for the property. */ | |
525 enum prop_idx idx; | |
526 | |
527 /* A handler function called to set up iterator IT from the property | |
528 at IT's current position. Value is used to steer handle_stop. */ | |
529 enum prop_handled (*handler) P_ ((struct it *it)); | |
530 }; | |
531 | |
532 static enum prop_handled handle_face_prop P_ ((struct it *)); | |
533 static enum prop_handled handle_invisible_prop P_ ((struct it *)); | |
534 static enum prop_handled handle_display_prop P_ ((struct it *)); | |
535 static enum prop_handled handle_overlay_change P_ ((struct it *)); | |
536 static enum prop_handled handle_fontified_prop P_ ((struct it *)); | |
537 | |
538 /* Properties handled by iterators. */ | |
539 | |
540 static struct props it_props[] = | |
541 { | |
542 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop}, | |
543 /* Handle `face' before `display' because some sub-properties of | |
544 `display' need to know the face. */ | |
545 {&Qface, FACE_PROP_IDX, handle_face_prop}, | |
546 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop}, | |
547 {&Qinvisible, INVISIBLE_PROP_IDX, handle_invisible_prop}, | |
548 {NULL, 0, NULL} | |
549 }; | |
550 | |
551 /* Value is the position described by X. If X is a marker, value is | |
552 the marker_position of X. Otherwise, value is X. */ | |
553 | |
554 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X)) | |
555 | |
556 /* Enumeration returned by some move_it_.* functions internally. */ | |
557 | |
558 enum move_it_result | |
559 { | |
560 /* Not used. Undefined value. */ | |
561 MOVE_UNDEFINED, | |
562 | |
563 /* Move ended at the requested buffer position or ZV. */ | |
564 MOVE_POS_MATCH_OR_ZV, | |
565 | |
566 /* Move ended at the requested X pixel position. */ | |
567 MOVE_X_REACHED, | |
568 | |
569 /* Move within a line ended at the end of a line that must be | |
570 continued. */ | |
571 MOVE_LINE_CONTINUED, | |
572 | |
573 /* Move within a line ended at the end of a line that would | |
574 be displayed truncated. */ | |
575 MOVE_LINE_TRUNCATED, | |
576 | |
577 /* Move within a line ended at a line end. */ | |
578 MOVE_NEWLINE_OR_CR | |
579 }; | |
580 | |
581 | |
582 | |
583 /* Function prototypes. */ | |
584 | |
25543 | 585 static struct glyph_row *row_containing_pos P_ ((struct window *, int, |
586 struct glyph_row *, | |
587 struct glyph_row *)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
588 static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
589 static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
590 static void clear_garbaged_frames P_ ((void)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
591 static int current_message_1 P_ ((Lisp_Object *)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
592 static int truncate_message_1 P_ ((int)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
593 static int set_message_1 P_ ((char *s, Lisp_Object, int, int)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
594 static int display_echo_area P_ ((struct window *)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
595 static int display_echo_area_1 P_ ((struct window *)); |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
596 static Lisp_Object unwind_redisplay P_ ((Lisp_Object)); |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
597 static int string_char_and_length P_ ((unsigned char *, int, int *)); |
25012 | 598 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, |
599 struct text_pos)); | |
600 static int compute_window_start_on_continuation_line P_ ((struct window *)); | |
601 static Lisp_Object eval_handler P_ ((Lisp_Object)); | |
602 static Lisp_Object eval_form P_ ((Lisp_Object)); | |
603 static void insert_left_trunc_glyphs P_ ((struct it *)); | |
604 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); | |
605 static void extend_face_to_end_of_line P_ ((struct it *)); | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
606 static int append_space P_ ((struct it *, int)); |
25012 | 607 static void make_cursor_line_fully_visible P_ ((struct window *)); |
608 static int try_scrolling P_ ((Lisp_Object, int, int, int, int)); | |
609 static int trailing_whitespace_p P_ ((int)); | |
610 static int message_log_check_duplicate P_ ((int, int, int, int)); | |
611 int invisible_p P_ ((Lisp_Object, Lisp_Object)); | |
612 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); | |
613 static void push_it P_ ((struct it *)); | |
614 static void pop_it P_ ((struct it *)); | |
615 static void sync_frame_with_window_matrix_rows P_ ((struct window *)); | |
616 static void redisplay_internal P_ ((int)); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
617 static int echo_area_display P_ ((int)); |
25012 | 618 static void redisplay_windows P_ ((Lisp_Object)); |
619 static void redisplay_window P_ ((Lisp_Object, int)); | |
620 static void update_menu_bar P_ ((struct frame *, int)); | |
621 static int try_window_reusing_current_matrix P_ ((struct window *)); | |
622 static int try_window_id P_ ((struct window *)); | |
623 static int display_line P_ ((struct it *)); | |
624 static void display_mode_lines P_ ((struct window *)); | |
625 static void display_mode_line P_ ((struct window *, enum face_id, | |
626 Lisp_Object)); | |
627 static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object)); | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26018
diff
changeset
|
628 static char *decode_mode_spec P_ ((struct window *, int, int, int)); |
25012 | 629 static void display_menu_bar P_ ((struct window *)); |
630 static int display_count_lines P_ ((int, int, int, int, int *)); | |
631 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, | |
632 int, int, struct it *, int, int, int, int)); | |
633 static void compute_line_metrics P_ ((struct it *)); | |
634 static void run_redisplay_end_trigger_hook P_ ((struct it *)); | |
635 static int get_overlay_strings P_ ((struct it *)); | |
636 static void next_overlay_string P_ ((struct it *)); | |
637 void set_iterator_to_next P_ ((struct it *)); | |
638 static void reseat P_ ((struct it *, struct text_pos, int)); | |
639 static void reseat_1 P_ ((struct it *, struct text_pos, int)); | |
640 static void back_to_previous_visible_line_start P_ ((struct it *)); | |
641 static void reseat_at_previous_visible_line_start P_ ((struct it *)); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
642 static void reseat_at_next_visible_line_start P_ ((struct it *, int)); |
25012 | 643 static int next_element_from_display_vector P_ ((struct it *)); |
644 static int next_element_from_string P_ ((struct it *)); | |
645 static int next_element_from_c_string P_ ((struct it *)); | |
646 static int next_element_from_buffer P_ ((struct it *)); | |
647 static int next_element_from_image P_ ((struct it *)); | |
648 static int next_element_from_stretch P_ ((struct it *)); | |
649 static void load_overlay_strings P_ ((struct it *)); | |
650 static void init_from_display_pos P_ ((struct it *, struct window *, | |
651 struct display_pos *)); | |
652 static void reseat_to_string P_ ((struct it *, unsigned char *, | |
653 Lisp_Object, int, int, int, int)); | |
654 static int charset_at_position P_ ((struct text_pos)); | |
655 static enum move_it_result move_it_in_display_line_to P_ ((struct it *, | |
656 int, int, int)); | |
657 void move_it_vertically_backward P_ ((struct it *, int)); | |
658 static void init_to_row_start P_ ((struct it *, struct window *, | |
659 struct glyph_row *)); | |
660 static void init_to_row_end P_ ((struct it *, struct window *, | |
661 struct glyph_row *)); | |
662 static void back_to_previous_line_start P_ ((struct it *)); | |
663 static void forward_to_next_line_start P_ ((struct it *)); | |
664 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, | |
665 Lisp_Object, int)); | |
666 static struct text_pos string_pos P_ ((int, Lisp_Object)); | |
667 static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); | |
668 static int number_of_chars P_ ((unsigned char *, int)); | |
669 static void compute_stop_pos P_ ((struct it *)); | |
670 static void compute_string_pos P_ ((struct text_pos *, struct text_pos, | |
671 Lisp_Object)); | |
672 static int face_before_or_after_it_pos P_ ((struct it *, int)); | |
673 static int next_overlay_change P_ ((int)); | |
674 static int handle_single_display_prop P_ ((struct it *, Lisp_Object, | |
675 Lisp_Object, struct text_pos *)); | |
676 | |
677 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) | |
678 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) | |
679 | |
680 #ifdef HAVE_WINDOW_SYSTEM | |
681 | |
25543 | 682 static void update_tool_bar P_ ((struct frame *, int)); |
683 static void build_desired_tool_bar_string P_ ((struct frame *f)); | |
684 static int redisplay_tool_bar P_ ((struct frame *)); | |
685 static void display_tool_bar_line P_ ((struct it *)); | |
25012 | 686 |
687 #endif /* HAVE_WINDOW_SYSTEM */ | |
688 | |
689 | |
690 /*********************************************************************** | |
691 Window display dimensions | |
692 ***********************************************************************/ | |
693 | |
694 /* Return the window-relative maximum y + 1 for glyph rows displaying | |
695 text in window W. This is the height of W minus the height of a | |
696 mode line, if any. */ | |
697 | |
698 INLINE int | |
699 window_text_bottom_y (w) | |
700 struct window *w; | |
701 { | |
702 struct frame *f = XFRAME (w->frame); | |
703 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
704 | |
705 if (WINDOW_WANTS_MODELINE_P (w)) | |
706 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
707 return height; | |
708 } | |
709 | |
710 | |
711 /* Return the pixel width of display area AREA of window W. AREA < 0 | |
712 means return the total width of W, not including bitmap areas to | |
713 the left and right of the window. */ | |
714 | |
715 INLINE int | |
716 window_box_width (w, area) | |
717 struct window *w; | |
718 int area; | |
719 { | |
720 struct frame *f = XFRAME (w->frame); | |
721 int width = XFASTINT (w->width); | |
722 | |
723 if (!w->pseudo_window_p) | |
724 { | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
725 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
25012 | 726 |
727 if (area == TEXT_AREA) | |
728 { | |
729 if (INTEGERP (w->left_margin_width)) | |
730 width -= XFASTINT (w->left_margin_width); | |
731 if (INTEGERP (w->right_margin_width)) | |
732 width -= XFASTINT (w->right_margin_width); | |
733 } | |
734 else if (area == LEFT_MARGIN_AREA) | |
735 width = (INTEGERP (w->left_margin_width) | |
736 ? XFASTINT (w->left_margin_width) : 0); | |
737 else if (area == RIGHT_MARGIN_AREA) | |
738 width = (INTEGERP (w->right_margin_width) | |
739 ? XFASTINT (w->right_margin_width) : 0); | |
740 } | |
741 | |
742 return width * CANON_X_UNIT (f); | |
743 } | |
744 | |
745 | |
746 /* Return the pixel height of the display area of window W, not | |
747 including mode lines of W, if any.. */ | |
748 | |
749 INLINE int | |
750 window_box_height (w) | |
751 struct window *w; | |
752 { | |
753 struct frame *f = XFRAME (w->frame); | |
754 int height = XFASTINT (w->height) * CANON_Y_UNIT (f); | |
755 | |
756 if (WINDOW_WANTS_MODELINE_P (w)) | |
757 height -= CURRENT_MODE_LINE_HEIGHT (w); | |
758 | |
25546 | 759 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
760 height -= CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 761 |
762 return height; | |
763 } | |
764 | |
765 | |
766 /* Return the frame-relative coordinate of the left edge of display | |
767 area AREA of window W. AREA < 0 means return the left edge of the | |
768 whole window, to the right of any bitmap area at the left side of | |
769 W. */ | |
770 | |
771 INLINE int | |
772 window_box_left (w, area) | |
773 struct window *w; | |
774 int area; | |
775 { | |
776 struct frame *f = XFRAME (w->frame); | |
777 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | |
778 | |
779 if (!w->pseudo_window_p) | |
780 { | |
781 x += (WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f) | |
25463
255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25403
diff
changeset
|
782 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
25012 | 783 |
784 if (area == TEXT_AREA) | |
785 x += window_box_width (w, LEFT_MARGIN_AREA); | |
786 else if (area == RIGHT_MARGIN_AREA) | |
787 x += (window_box_width (w, LEFT_MARGIN_AREA) | |
788 + window_box_width (w, TEXT_AREA)); | |
789 } | |
790 | |
791 return x; | |
792 } | |
793 | |
794 | |
795 /* Return the frame-relative coordinate of the right edge of display | |
796 area AREA of window W. AREA < 0 means return the left edge of the | |
797 whole window, to the left of any bitmap area at the right side of | |
798 W. */ | |
799 | |
800 INLINE int | |
801 window_box_right (w, area) | |
802 struct window *w; | |
803 int area; | |
804 { | |
805 return window_box_left (w, area) + window_box_width (w, area); | |
806 } | |
807 | |
808 | |
809 /* Get the bounding box of the display area AREA of window W, without | |
810 mode lines, in frame-relative coordinates. AREA < 0 means the | |
811 whole window, not including bitmap areas to the left and right of | |
812 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel | |
813 coordinates of the upper-left corner of the box. Return in | |
814 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ | |
815 | |
816 INLINE void | |
817 window_box (w, area, box_x, box_y, box_width, box_height) | |
818 struct window *w; | |
819 int area; | |
820 int *box_x, *box_y, *box_width, *box_height; | |
821 { | |
822 struct frame *f = XFRAME (w->frame); | |
823 | |
824 *box_width = window_box_width (w, area); | |
825 *box_height = window_box_height (w); | |
826 *box_x = window_box_left (w, area); | |
827 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f) | |
828 + XFASTINT (w->top) * CANON_Y_UNIT (f)); | |
25546 | 829 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
830 *box_y += CURRENT_HEADER_LINE_HEIGHT (w); | |
25012 | 831 } |
832 | |
833 | |
834 /* Get the bounding box of the display area AREA of window W, without | |
835 mode lines. AREA < 0 means the whole window, not including bitmap | |
836 areas to the left and right of the window. Return in *TOP_LEFT_X | |
837 and TOP_LEFT_Y the frame-relative pixel coordinates of the | |
838 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and | |
839 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the | |
840 box. */ | |
841 | |
842 INLINE void | |
843 window_box_edges (w, area, top_left_x, top_left_y, | |
844 bottom_right_x, bottom_right_y) | |
845 struct window *w; | |
846 int area; | |
847 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y; | |
848 { | |
849 window_box (w, area, top_left_x, top_left_y, bottom_right_x, | |
850 bottom_right_y); | |
851 *bottom_right_x += *top_left_x; | |
852 *bottom_right_y += *top_left_y; | |
853 } | |
854 | |
855 | |
856 | |
857 /*********************************************************************** | |
858 Utilities | |
859 ***********************************************************************/ | |
860 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
861 /* Return the next character from STR which is MAXLEN bytes long. |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
862 Return in *LEN the length of the character. This is like |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
863 STRING_CHAR_AND_LENGTH but never returns an invalid character. If |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
864 we find one, we return a `?', but with the length of the illegal |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
865 character. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
866 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
867 static INLINE int |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
868 string_char_and_length (str, maxlen, len) |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
869 unsigned char *str; |
25098
188fc8b67ea9
(string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25096
diff
changeset
|
870 int maxlen, *len; |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
871 { |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
872 int c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
873 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
874 c = STRING_CHAR_AND_LENGTH (str, maxlen, *len); |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
875 if (!CHAR_VALID_P (c, 1)) |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
876 /* We may not change the length here because other places in Emacs |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
877 don't use this function, i.e. they silently accept illegal |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
878 characters. */ |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
879 c = '?'; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
880 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
881 return c; |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
882 } |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
883 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
884 |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
885 |
25012 | 886 /* Given a position POS containing a valid character and byte position |
887 in STRING, return the position NCHARS ahead (NCHARS >= 0). */ | |
888 | |
889 static struct text_pos | |
890 string_pos_nchars_ahead (pos, string, nchars) | |
891 struct text_pos pos; | |
892 Lisp_Object string; | |
893 int nchars; | |
894 { | |
895 xassert (STRINGP (string) && nchars >= 0); | |
896 | |
897 if (STRING_MULTIBYTE (string)) | |
898 { | |
899 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos); | |
900 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos); | |
901 int len; | |
902 | |
903 while (nchars--) | |
904 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
905 string_char_and_length (p, rest, &len); |
25012 | 906 p += len, rest -= len; |
907 xassert (rest >= 0); | |
908 CHARPOS (pos) += 1; | |
909 BYTEPOS (pos) += len; | |
910 } | |
911 } | |
912 else | |
913 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars); | |
914 | |
915 return pos; | |
916 } | |
917 | |
918 | |
919 /* Value is the text position, i.e. character and byte position, | |
920 for character position CHARPOS in STRING. */ | |
921 | |
922 static INLINE struct text_pos | |
923 string_pos (charpos, string) | |
924 int charpos; | |
925 Lisp_Object string; | |
926 { | |
927 struct text_pos pos; | |
928 xassert (STRINGP (string)); | |
929 xassert (charpos >= 0); | |
930 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos)); | |
931 return pos; | |
932 } | |
933 | |
934 | |
935 /* Value is a text position, i.e. character and byte position, for | |
936 character position CHARPOS in C string S. MULTIBYTE_P non-zero | |
937 means recognize multibyte characters. */ | |
938 | |
939 static struct text_pos | |
940 c_string_pos (charpos, s, multibyte_p) | |
941 int charpos; | |
942 unsigned char *s; | |
943 int multibyte_p; | |
944 { | |
945 struct text_pos pos; | |
946 | |
947 xassert (s != NULL); | |
948 xassert (charpos >= 0); | |
949 | |
950 if (multibyte_p) | |
951 { | |
952 int rest = strlen (s), len; | |
953 | |
954 SET_TEXT_POS (pos, 0, 0); | |
955 while (charpos--) | |
956 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
957 string_char_and_length (s, rest, &len); |
25012 | 958 s += len, rest -= len; |
959 xassert (rest >= 0); | |
960 CHARPOS (pos) += 1; | |
961 BYTEPOS (pos) += len; | |
962 } | |
963 } | |
964 else | |
965 SET_TEXT_POS (pos, charpos, charpos); | |
966 | |
967 return pos; | |
968 } | |
969 | |
970 | |
971 /* Value is the number of characters in C string S. MULTIBYTE_P | |
972 non-zero means recognize multibyte characters. */ | |
973 | |
974 static int | |
975 number_of_chars (s, multibyte_p) | |
976 unsigned char *s; | |
977 int multibyte_p; | |
978 { | |
979 int nchars; | |
980 | |
981 if (multibyte_p) | |
982 { | |
983 int rest = strlen (s), len; | |
984 unsigned char *p = (unsigned char *) s; | |
985 | |
986 for (nchars = 0; rest > 0; ++nchars) | |
987 { | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
988 string_char_and_length (p, rest, &len); |
25012 | 989 rest -= len, p += len; |
990 } | |
991 } | |
992 else | |
993 nchars = strlen (s); | |
994 | |
995 return nchars; | |
996 } | |
997 | |
998 | |
999 /* Compute byte position NEWPOS->bytepos corresponding to | |
1000 NEWPOS->charpos. POS is a known position in string STRING. | |
1001 NEWPOS->charpos must be >= POS.charpos. */ | |
1002 | |
1003 static void | |
1004 compute_string_pos (newpos, pos, string) | |
1005 struct text_pos *newpos, pos; | |
1006 Lisp_Object string; | |
1007 { | |
1008 xassert (STRINGP (string)); | |
1009 xassert (CHARPOS (*newpos) >= CHARPOS (pos)); | |
1010 | |
1011 if (STRING_MULTIBYTE (string)) | |
1012 *newpos = string_pos_nchars_ahead (pos, CHARPOS (*newpos) - CHARPOS (pos), | |
1013 string); | |
1014 else | |
1015 BYTEPOS (*newpos) = CHARPOS (*newpos); | |
1016 } | |
1017 | |
1018 | |
1019 /* Return the charset of the character at position POS in | |
1020 current_buffer. */ | |
1021 | |
1022 static int | |
1023 charset_at_position (pos) | |
1024 struct text_pos pos; | |
1025 { | |
1026 int c, multibyte_p; | |
1027 unsigned char *p = BYTE_POS_ADDR (BYTEPOS (pos)); | |
1028 | |
1029 multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1030 if (multibyte_p) | |
1031 { | |
1032 int maxlen = ((BYTEPOS (pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
1033 - BYTEPOS (pos)); | |
1034 int len; | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1035 c = string_char_and_length (p, maxlen, &len); |
25012 | 1036 } |
1037 else | |
1038 c = *p; | |
1039 | |
1040 return CHAR_CHARSET (c); | |
1041 } | |
1042 | |
1043 | |
1044 | |
1045 /*********************************************************************** | |
1046 Lisp form evaluation | |
1047 ***********************************************************************/ | |
1048 | |
1049 /* Error handler for eval_form. */ | |
1050 | |
1051 static Lisp_Object | |
1052 eval_handler (arg) | |
1053 Lisp_Object arg; | |
1054 { | |
1055 return Qnil; | |
1056 } | |
1057 | |
1058 | |
1059 /* Evaluate SEXPR and return the result, or nil if something went | |
1060 wrong. */ | |
1061 | |
1062 static Lisp_Object | |
1063 eval_form (sexpr) | |
1064 Lisp_Object sexpr; | |
1065 { | |
1066 int count = specpdl_ptr - specpdl; | |
1067 Lisp_Object val; | |
1068 specbind (Qinhibit_redisplay, Qt); | |
1069 val = internal_condition_case_1 (Feval, sexpr, Qerror, eval_handler); | |
1070 return unbind_to (count, val); | |
1071 } | |
1072 | |
1073 | |
1074 | |
1075 /*********************************************************************** | |
1076 Debugging | |
1077 ***********************************************************************/ | |
1078 | |
1079 #if 0 | |
1080 | |
1081 /* Define CHECK_IT to perform sanity checks on iterators. | |
1082 This is for debugging. It is too slow to do unconditionally. */ | |
1083 | |
1084 static void | |
1085 check_it (it) | |
1086 struct it *it; | |
1087 { | |
1088 if (it->method == next_element_from_string) | |
1089 { | |
1090 xassert (STRINGP (it->string)); | |
1091 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
1092 } | |
1093 else if (it->method == next_element_from_buffer) | |
1094 { | |
1095 /* Check that character and byte positions agree. */ | |
1096 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it))); | |
1097 } | |
1098 | |
1099 if (it->dpvec) | |
1100 xassert (it->current.dpvec_index >= 0); | |
1101 else | |
1102 xassert (it->current.dpvec_index < 0); | |
1103 } | |
1104 | |
1105 #define CHECK_IT(IT) check_it ((IT)) | |
1106 | |
1107 #else /* not 0 */ | |
1108 | |
1109 #define CHECK_IT(IT) (void) 0 | |
1110 | |
1111 #endif /* not 0 */ | |
1112 | |
1113 | |
1114 #if GLYPH_DEBUG | |
1115 | |
1116 /* Check that the window end of window W is what we expect it | |
1117 to be---the last row in the current matrix displaying text. */ | |
1118 | |
1119 static void | |
1120 check_window_end (w) | |
1121 struct window *w; | |
1122 { | |
1123 if (!MINI_WINDOW_P (w) | |
1124 && !NILP (w->window_end_valid)) | |
1125 { | |
1126 struct glyph_row *row; | |
1127 xassert ((row = MATRIX_ROW (w->current_matrix, | |
1128 XFASTINT (w->window_end_vpos)), | |
1129 !row->enabled_p | |
1130 || MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1131 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)); | |
1132 } | |
1133 } | |
1134 | |
1135 #define CHECK_WINDOW_END(W) check_window_end ((W)) | |
1136 | |
1137 #else /* not GLYPH_DEBUG */ | |
1138 | |
1139 #define CHECK_WINDOW_END(W) (void) 0 | |
1140 | |
1141 #endif /* not GLYPH_DEBUG */ | |
1142 | |
1143 | |
1144 | |
1145 /*********************************************************************** | |
1146 Iterator initialization | |
1147 ***********************************************************************/ | |
1148 | |
1149 /* Initialize IT for displaying current_buffer in window W, starting | |
1150 at character position CHARPOS. CHARPOS < 0 means that no buffer | |
1151 position is specified which is useful when the iterator is assigned | |
1152 a position later. BYTEPOS is the byte position corresponding to | |
1153 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS. | |
1154 | |
1155 If ROW is not null, calls to produce_glyphs with IT as parameter | |
1156 will produce glyphs in that row. | |
1157 | |
1158 BASE_FACE_ID is the id of a base face to use. It must be one of | |
1159 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or | |
25546 | 1160 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for |
25543 | 1161 displaying the tool-bar. |
25012 | 1162 |
1163 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or | |
25546 | 1164 HEADER_LINE_FACE_ID, the iterator will be initialized to use the |
25012 | 1165 corresponding mode line glyph row of the desired matrix of W. */ |
1166 | |
1167 void | |
1168 init_iterator (it, w, charpos, bytepos, row, base_face_id) | |
1169 struct it *it; | |
1170 struct window *w; | |
1171 int charpos, bytepos; | |
1172 struct glyph_row *row; | |
1173 enum face_id base_face_id; | |
1174 { | |
1175 int highlight_region_p; | |
1176 | |
1177 /* Some precondition checks. */ | |
1178 xassert (w != NULL && it != NULL); | |
1179 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV)); | |
1180 | |
1181 /* If face attributes have been changed since the last redisplay, | |
1182 free realized faces now because they depend on face definitions | |
1183 that might have changed. */ | |
1184 if (face_change_count) | |
1185 { | |
1186 face_change_count = 0; | |
1187 free_all_realized_faces (Qnil); | |
1188 } | |
1189 | |
1190 /* Use one of the mode line rows of W's desired matrix if | |
1191 appropriate. */ | |
1192 if (row == NULL) | |
1193 { | |
1194 if (base_face_id == MODE_LINE_FACE_ID) | |
1195 row = MATRIX_MODE_LINE_ROW (w->desired_matrix); | |
25546 | 1196 else if (base_face_id == HEADER_LINE_FACE_ID) |
1197 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix); | |
25012 | 1198 } |
1199 | |
1200 /* Clear IT. */ | |
1201 bzero (it, sizeof *it); | |
1202 it->current.overlay_string_index = -1; | |
1203 it->current.dpvec_index = -1; | |
1204 it->charset = CHARSET_ASCII; | |
1205 it->base_face_id = base_face_id; | |
1206 | |
1207 /* The window in which we iterate over current_buffer: */ | |
1208 XSETWINDOW (it->window, w); | |
1209 it->w = w; | |
1210 it->f = XFRAME (w->frame); | |
1211 | |
1212 /* If realized faces have been removed, e.g. because of face | |
1213 attribute changes of named faces, recompute them. */ | |
1214 if (FRAME_FACE_CACHE (it->f)->used == 0) | |
1215 recompute_basic_faces (it->f); | |
1216 | |
1217 /* Current value of the `space-width', and 'height' properties. */ | |
1218 it->space_width = Qnil; | |
1219 it->font_height = Qnil; | |
1220 | |
1221 /* Are control characters displayed as `^C'? */ | |
1222 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow); | |
1223 | |
1224 /* -1 means everything between a CR and the following line end | |
1225 is invisible. >0 means lines indented more than this value are | |
1226 invisible. */ | |
1227 it->selective = (INTEGERP (current_buffer->selective_display) | |
1228 ? XFASTINT (current_buffer->selective_display) | |
1229 : (!NILP (current_buffer->selective_display) | |
1230 ? -1 : 0)); | |
1231 it->selective_display_ellipsis_p | |
1232 = !NILP (current_buffer->selective_display_ellipses); | |
1233 | |
1234 /* Display table to use. */ | |
1235 it->dp = window_display_table (w); | |
1236 | |
1237 /* Are multibyte characters enabled in current_buffer? */ | |
1238 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | |
1239 | |
1240 /* Non-zero if we should highlight the region. */ | |
1241 highlight_region_p | |
1242 = (!NILP (Vtransient_mark_mode) | |
1243 && !NILP (current_buffer->mark_active) | |
1244 && XMARKER (current_buffer->mark)->buffer != 0); | |
1245 | |
1246 /* Set IT->region_beg_charpos and IT->region_end_charpos to the | |
1247 start and end of a visible region in window IT->w. Set both to | |
1248 -1 to indicate no region. */ | |
1249 if (highlight_region_p | |
1250 /* Maybe highlight only in selected window. */ | |
1251 && (/* Either show region everywhere. */ | |
1252 highlight_nonselected_windows | |
1253 /* Or show region in the selected window. */ | |
1254 || w == XWINDOW (selected_window) | |
1255 /* Or show the region if we are in the mini-buffer and W is | |
1256 the window the mini-buffer refers to. */ | |
1257 || (MINI_WINDOW_P (XWINDOW (selected_window)) | |
1258 && w == XWINDOW (Vminibuf_scroll_window)))) | |
1259 { | |
1260 int charpos = marker_position (current_buffer->mark); | |
1261 it->region_beg_charpos = min (PT, charpos); | |
1262 it->region_end_charpos = max (PT, charpos); | |
1263 } | |
1264 else | |
1265 it->region_beg_charpos = it->region_end_charpos = -1; | |
1266 | |
1267 /* Get the position at which the redisplay_end_trigger hook should | |
1268 be run, if it is to be run at all. */ | |
1269 if (MARKERP (w->redisplay_end_trigger) | |
1270 && XMARKER (w->redisplay_end_trigger)->buffer != 0) | |
1271 it->redisplay_end_trigger_charpos | |
1272 = marker_position (w->redisplay_end_trigger); | |
1273 else if (INTEGERP (w->redisplay_end_trigger)) | |
1274 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger); | |
1275 | |
1276 /* Correct bogus values of tab_width. */ | |
1277 it->tab_width = XINT (current_buffer->tab_width); | |
1278 if (it->tab_width <= 0 || it->tab_width > 1000) | |
1279 it->tab_width = 8; | |
1280 | |
1281 /* Are lines in the display truncated? */ | |
1282 it->truncate_lines_p | |
1283 = (base_face_id != DEFAULT_FACE_ID | |
1284 || XINT (it->w->hscroll) | |
1285 || (truncate_partial_width_windows | |
1286 && !WINDOW_FULL_WIDTH_P (it->w)) | |
1287 || !NILP (current_buffer->truncate_lines)); | |
1288 | |
1289 /* Get dimensions of truncation and continuation glyphs. These are | |
1290 displayed as bitmaps under X, so we don't need them for such | |
1291 frames. */ | |
1292 if (!FRAME_WINDOW_P (it->f)) | |
1293 { | |
1294 if (it->truncate_lines_p) | |
1295 { | |
1296 /* We will need the truncation glyph. */ | |
1297 xassert (it->glyph_row == NULL); | |
1298 produce_special_glyphs (it, IT_TRUNCATION); | |
1299 it->truncation_pixel_width = it->pixel_width; | |
1300 } | |
1301 else | |
1302 { | |
1303 /* We will need the continuation glyph. */ | |
1304 xassert (it->glyph_row == NULL); | |
1305 produce_special_glyphs (it, IT_CONTINUATION); | |
1306 it->continuation_pixel_width = it->pixel_width; | |
1307 } | |
1308 | |
1309 /* Reset these values to zero becaue the produce_special_glyphs | |
1310 above has changed them. */ | |
1311 it->pixel_width = it->ascent = it->descent = 0; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
1312 it->phys_ascent = it->phys_descent = 0; |
25012 | 1313 } |
1314 | |
1315 /* Set this after getting the dimensions of truncation and | |
1316 continuation glyphs, so that we don't produce glyphs when calling | |
1317 produce_special_glyphs, above. */ | |
1318 it->glyph_row = row; | |
1319 it->area = TEXT_AREA; | |
1320 | |
1321 /* Get the dimensions of the display area. The display area | |
1322 consists of the visible window area plus a horizontally scrolled | |
1323 part to the left of the window. All x-values are relative to the | |
1324 start of this total display area. */ | |
1325 if (base_face_id != DEFAULT_FACE_ID) | |
1326 { | |
1327 /* Mode lines, menu bar in terminal frames. */ | |
1328 it->first_visible_x = 0; | |
1329 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f); | |
1330 } | |
1331 else | |
1332 { | |
1333 it->first_visible_x | |
1334 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f); | |
1335 it->last_visible_x = (it->first_visible_x | |
1336 + window_box_width (w, TEXT_AREA)); | |
1337 | |
1338 /* If we truncate lines, leave room for the truncator glyph(s) at | |
1339 the right margin. Otherwise, leave room for the continuation | |
1340 glyph(s). Truncation and continuation glyphs are not inserted | |
1341 for window-based redisplay. */ | |
1342 if (!FRAME_WINDOW_P (it->f)) | |
1343 { | |
1344 if (it->truncate_lines_p) | |
1345 it->last_visible_x -= it->truncation_pixel_width; | |
1346 else | |
1347 it->last_visible_x -= it->continuation_pixel_width; | |
1348 } | |
1349 | |
25546 | 1350 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
1351 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll; | |
25012 | 1352 } |
1353 | |
1354 /* Leave room for a border glyph. */ | |
1355 if (!FRAME_WINDOW_P (it->f) | |
1356 && !WINDOW_RIGHTMOST_P (it->w)) | |
1357 it->last_visible_x -= 1; | |
1358 | |
1359 it->last_visible_y = window_text_bottom_y (w); | |
1360 | |
1361 /* For mode lines and alike, arrange for the first glyph having a | |
1362 left box line if the face specifies a box. */ | |
1363 if (base_face_id != DEFAULT_FACE_ID) | |
1364 { | |
1365 struct face *face; | |
1366 | |
1367 it->face_id = base_face_id; | |
1368 | |
1369 /* If we have a boxed mode line, make the first character appear | |
1370 with a left box line. */ | |
1371 face = FACE_FROM_ID (it->f, base_face_id); | |
1372 if (face->box != FACE_NO_BOX) | |
1373 it->start_of_box_run_p = 1; | |
1374 } | |
1375 | |
1376 /* If a buffer position was specified, set the iterator there, | |
1377 getting overlays and face properties from that position. */ | |
1378 if (charpos > 0) | |
1379 { | |
1380 it->end_charpos = ZV; | |
1381 it->face_id = -1; | |
1382 IT_CHARPOS (*it) = charpos; | |
1383 | |
1384 /* Compute byte position if not specified. */ | |
1385 if (bytepos <= 0) | |
1386 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos); | |
1387 else | |
1388 IT_BYTEPOS (*it) = bytepos; | |
1389 | |
1390 /* Compute faces etc. */ | |
1391 reseat (it, it->current.pos, 1); | |
1392 } | |
1393 | |
1394 CHECK_IT (it); | |
1395 } | |
1396 | |
1397 | |
1398 /* Initialize IT for the display of window W with window start POS. */ | |
1399 | |
1400 void | |
1401 start_display (it, w, pos) | |
1402 struct it *it; | |
1403 struct window *w; | |
1404 struct text_pos pos; | |
1405 { | |
1406 int start_at_line_beg_p; | |
1407 struct glyph_row *row; | |
25546 | 1408 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 1409 int first_y; |
1410 | |
1411 row = w->desired_matrix->rows + first_vpos; | |
1412 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID); | |
1413 first_y = it->current_y; | |
1414 | |
1415 /* If window start is not at a line start, move back to the line | |
1416 start. This makes sure that we take continuation lines into | |
1417 account. */ | |
1418 start_at_line_beg_p = (CHARPOS (pos) == BEGV | |
1419 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n'); | |
1420 if (!start_at_line_beg_p) | |
1421 reseat_at_previous_visible_line_start (it); | |
1422 | |
1423 /* If window start is not at a line start, skip forward to POS to | |
1424 get the correct continuation_lines_width and current_x. */ | |
1425 if (!start_at_line_beg_p) | |
1426 { | |
1427 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS); | |
1428 | |
1429 /* If lines are continued, this line may end in the middle of a | |
1430 multi-glyph character (e.g. a control character displayed as | |
1431 \003, or in the middle of an overlay string). In this case | |
1432 move_it_to above will not have taken us to the start of | |
1433 the continuation line but to the end of the continued line. */ | |
1434 if (!it->truncate_lines_p && it->current_x > 0) | |
1435 { | |
1436 if (it->current.dpvec_index >= 0 | |
1437 || it->current.overlay_string_index >= 0) | |
1438 { | |
1439 set_iterator_to_next (it); | |
1440 move_it_in_display_line_to (it, -1, -1, 0); | |
1441 } | |
1442 it->continuation_lines_width += it->current_x; | |
1443 } | |
1444 | |
1445 it->current_y = first_y; | |
1446 it->vpos = 0; | |
1447 it->current_x = it->hpos = 0; | |
1448 } | |
1449 | |
1450 #if 0 /* Don't assert the following because start_display is sometimes | |
1451 called intentionally with a window start that is not at a | |
1452 line start. Please leave this code in as a comment. */ | |
1453 | |
1454 /* Window start should be on a line start, now. */ | |
1455 xassert (it->continuation_lines_width | |
1456 || IT_CHARPOS (it) == BEGV | |
1457 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n'); | |
1458 #endif /* 0 */ | |
1459 } | |
1460 | |
1461 | |
1462 /* Initialize IT for stepping through current_buffer in window W, | |
1463 starting at position POS that includes overlay string and display | |
1464 vector/ control character translation position information. */ | |
1465 | |
1466 static void | |
1467 init_from_display_pos (it, w, pos) | |
1468 struct it *it; | |
1469 struct window *w; | |
1470 struct display_pos *pos; | |
1471 { | |
1472 /* Keep in mind: the call to reseat in init_iterator skips invisible | |
1473 text, so we might end up at a position different from POS. This | |
1474 is only a problem when POS is a row start after a newline and an | |
1475 overlay starts there with an after-string, and the overlay has an | |
1476 invisible property. Since we don't skip invisible text in | |
1477 display_line and elsewhere immediately after consuming the | |
1478 newline before the row start, such a POS will not be in a string, | |
1479 but the call to init_iterator below will move us to the | |
1480 after-string. */ | |
1481 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos), | |
1482 NULL, DEFAULT_FACE_ID); | |
1483 | |
1484 /* If position is within an overlay string, set up IT to | |
1485 the right overlay string. */ | |
1486 if (pos->overlay_string_index >= 0) | |
1487 { | |
1488 int relative_index; | |
1489 | |
1490 /* We already have the first chunk of overlay strings in | |
1491 IT->overlay_strings. Load more until the one for | |
1492 pos->overlay_string_index is in IT->overlay_strings. */ | |
1493 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE) | |
1494 { | |
1495 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE; | |
1496 it->current.overlay_string_index = 0; | |
1497 while (n--) | |
1498 { | |
1499 load_overlay_strings (it); | |
1500 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE; | |
1501 } | |
1502 } | |
1503 | |
1504 it->current.overlay_string_index = pos->overlay_string_index; | |
1505 relative_index = (it->current.overlay_string_index | |
1506 % OVERLAY_STRING_CHUNK_SIZE); | |
1507 it->string = it->overlay_strings[relative_index]; | |
1508 it->current.string_pos = pos->string_pos; | |
1509 it->method = next_element_from_string; | |
1510 } | |
1511 else if (CHARPOS (pos->string_pos) >= 0) | |
1512 { | |
1513 /* Recorded position is not in an overlay string, but in another | |
1514 string. This can only be a string from a `display' property. | |
1515 IT should already be filled with that string. */ | |
1516 it->current.string_pos = pos->string_pos; | |
1517 xassert (STRINGP (it->string)); | |
1518 } | |
1519 | |
1520 /* Restore position in display vector translations or control | |
1521 character translations. */ | |
1522 if (pos->dpvec_index >= 0) | |
1523 { | |
1524 /* This fills IT->dpvec. */ | |
1525 get_next_display_element (it); | |
1526 xassert (it->dpvec && it->current.dpvec_index == 0); | |
1527 it->current.dpvec_index = pos->dpvec_index; | |
1528 } | |
1529 | |
1530 CHECK_IT (it); | |
1531 } | |
1532 | |
1533 | |
1534 /* Initialize IT for stepping through current_buffer in window W | |
1535 starting at ROW->start. */ | |
1536 | |
1537 static void | |
1538 init_to_row_start (it, w, row) | |
1539 struct it *it; | |
1540 struct window *w; | |
1541 struct glyph_row *row; | |
1542 { | |
1543 init_from_display_pos (it, w, &row->start); | |
1544 it->continuation_lines_width = row->continuation_lines_width; | |
1545 CHECK_IT (it); | |
1546 } | |
1547 | |
1548 | |
1549 /* Initialize IT for stepping through current_buffer in window W | |
1550 starting in the line following ROW, i.e. starting at ROW->end. */ | |
1551 | |
1552 static void | |
1553 init_to_row_end (it, w, row) | |
1554 struct it *it; | |
1555 struct window *w; | |
1556 struct glyph_row *row; | |
1557 { | |
1558 init_from_display_pos (it, w, &row->end); | |
1559 | |
1560 if (row->continued_p) | |
1561 it->continuation_lines_width = (row->continuation_lines_width | |
1562 + row->pixel_width); | |
1563 CHECK_IT (it); | |
1564 } | |
1565 | |
1566 | |
1567 | |
1568 | |
1569 /*********************************************************************** | |
1570 Text properties | |
1571 ***********************************************************************/ | |
1572 | |
1573 /* Called when IT reaches IT->stop_charpos. Handle text property and | |
1574 overlay changes. Set IT->stop_charpos to the next position where | |
1575 to stop. */ | |
1576 | |
1577 static void | |
1578 handle_stop (it) | |
1579 struct it *it; | |
1580 { | |
1581 enum prop_handled handled; | |
1582 int handle_overlay_change_p = 1; | |
1583 struct props *p; | |
1584 | |
1585 it->dpvec = NULL; | |
1586 it->current.dpvec_index = -1; | |
1587 | |
1588 do | |
1589 { | |
1590 handled = HANDLED_NORMALLY; | |
1591 | |
1592 /* Call text property handlers. */ | |
1593 for (p = it_props; p->handler; ++p) | |
1594 { | |
1595 handled = p->handler (it); | |
1596 | |
1597 if (handled == HANDLED_RECOMPUTE_PROPS) | |
1598 break; | |
1599 else if (handled == HANDLED_RETURN) | |
1600 return; | |
1601 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED) | |
1602 handle_overlay_change_p = 0; | |
1603 } | |
1604 | |
1605 if (handled != HANDLED_RECOMPUTE_PROPS) | |
1606 { | |
1607 /* Don't check for overlay strings below when set to deliver | |
1608 characters from a display vector. */ | |
1609 if (it->method == next_element_from_display_vector) | |
1610 handle_overlay_change_p = 0; | |
1611 | |
1612 /* Handle overlay changes. */ | |
1613 if (handle_overlay_change_p) | |
1614 handled = handle_overlay_change (it); | |
1615 | |
1616 /* Determine where to stop next. */ | |
1617 if (handled == HANDLED_NORMALLY) | |
1618 compute_stop_pos (it); | |
1619 } | |
1620 } | |
1621 while (handled == HANDLED_RECOMPUTE_PROPS); | |
1622 } | |
1623 | |
1624 | |
1625 /* Compute IT->stop_charpos from text property and overlay change | |
1626 information for IT's current position. */ | |
1627 | |
1628 static void | |
1629 compute_stop_pos (it) | |
1630 struct it *it; | |
1631 { | |
1632 register INTERVAL iv, next_iv; | |
1633 Lisp_Object object, limit, position; | |
1634 | |
1635 /* If nowhere else, stop at the end. */ | |
1636 it->stop_charpos = it->end_charpos; | |
1637 | |
1638 if (STRINGP (it->string)) | |
1639 { | |
1640 /* Strings are usually short, so don't limit the search for | |
1641 properties. */ | |
1642 object = it->string; | |
1643 limit = Qnil; | |
1644 XSETFASTINT (position, IT_STRING_CHARPOS (*it)); | |
1645 } | |
1646 else | |
1647 { | |
1648 int charpos; | |
1649 | |
1650 /* If next overlay change is in front of the current stop pos | |
1651 (which is IT->end_charpos), stop there. Note: value of | |
1652 next_overlay_change is point-max if no overlay change | |
1653 follows. */ | |
1654 charpos = next_overlay_change (IT_CHARPOS (*it)); | |
1655 if (charpos < it->stop_charpos) | |
1656 it->stop_charpos = charpos; | |
1657 | |
1658 /* If showing the region, we have to stop at the region | |
1659 start or end because the face might change there. */ | |
1660 if (it->region_beg_charpos > 0) | |
1661 { | |
1662 if (IT_CHARPOS (*it) < it->region_beg_charpos) | |
1663 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos); | |
1664 else if (IT_CHARPOS (*it) < it->region_end_charpos) | |
1665 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos); | |
1666 } | |
1667 | |
1668 /* Set up variables for computing the stop position from text | |
1669 property changes. */ | |
1670 XSETBUFFER (object, current_buffer); | |
1671 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT); | |
1672 XSETFASTINT (position, IT_CHARPOS (*it)); | |
1673 | |
1674 } | |
1675 | |
1676 /* Get the interval containing IT's position. Value is a null | |
1677 interval if there isn't such an interval. */ | |
1678 iv = validate_interval_range (object, &position, &position, 0); | |
1679 if (!NULL_INTERVAL_P (iv)) | |
1680 { | |
1681 Lisp_Object values_here[LAST_PROP_IDX]; | |
1682 struct props *p; | |
1683 | |
1684 /* Get properties here. */ | |
1685 for (p = it_props; p->handler; ++p) | |
1686 values_here[p->idx] = textget (iv->plist, *p->name); | |
1687 | |
1688 /* Look for an interval following iv that has different | |
1689 properties. */ | |
1690 for (next_iv = next_interval (iv); | |
1691 (!NULL_INTERVAL_P (next_iv) | |
1692 && (NILP (limit) | |
1693 || XFASTINT (limit) > next_iv->position)); | |
1694 next_iv = next_interval (next_iv)) | |
1695 { | |
1696 for (p = it_props; p->handler; ++p) | |
1697 { | |
1698 Lisp_Object new_value; | |
1699 | |
1700 new_value = textget (next_iv->plist, *p->name); | |
1701 if (!EQ (values_here[p->idx], new_value)) | |
1702 break; | |
1703 } | |
1704 | |
1705 if (p->handler) | |
1706 break; | |
1707 } | |
1708 | |
1709 if (!NULL_INTERVAL_P (next_iv)) | |
1710 { | |
1711 if (INTEGERP (limit) | |
1712 && next_iv->position >= XFASTINT (limit)) | |
1713 /* No text property change up to limit. */ | |
1714 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos); | |
1715 else | |
1716 /* Text properties change in next_iv. */ | |
1717 it->stop_charpos = min (it->stop_charpos, next_iv->position); | |
1718 } | |
1719 } | |
1720 | |
1721 xassert (STRINGP (it->string) | |
1722 || (it->stop_charpos >= BEGV | |
1723 && it->stop_charpos >= IT_CHARPOS (*it))); | |
1724 } | |
1725 | |
1726 | |
1727 /* Return the position of the next overlay change after POS in | |
1728 current_buffer. Value is point-max if no overlay change | |
1729 follows. This is like `next-overlay-change' but doesn't use | |
1730 xmalloc. */ | |
1731 | |
1732 static int | |
1733 next_overlay_change (pos) | |
1734 int pos; | |
1735 { | |
1736 int noverlays; | |
1737 int endpos; | |
1738 Lisp_Object *overlays; | |
1739 int len; | |
1740 int i; | |
1741 | |
1742 /* Get all overlays at the given position. */ | |
1743 len = 10; | |
1744 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
1745 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL); | |
1746 if (noverlays > len) | |
1747 { | |
1748 len = noverlays; | |
1749 overlays = (Lisp_Object *) alloca (len * sizeof *overlays); | |
1750 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL); | |
1751 } | |
1752 | |
1753 /* If any of these overlays ends before endpos, | |
1754 use its ending point instead. */ | |
1755 for (i = 0; i < noverlays; ++i) | |
1756 { | |
1757 Lisp_Object oend; | |
1758 int oendpos; | |
1759 | |
1760 oend = OVERLAY_END (overlays[i]); | |
1761 oendpos = OVERLAY_POSITION (oend); | |
1762 endpos = min (endpos, oendpos); | |
1763 } | |
1764 | |
1765 return endpos; | |
1766 } | |
1767 | |
1768 | |
1769 | |
1770 /*********************************************************************** | |
1771 Fontification | |
1772 ***********************************************************************/ | |
1773 | |
1774 /* Handle changes in the `fontified' property of the current buffer by | |
1775 calling hook functions from Qfontification_functions to fontify | |
1776 regions of text. */ | |
1777 | |
1778 static enum prop_handled | |
1779 handle_fontified_prop (it) | |
1780 struct it *it; | |
1781 { | |
1782 Lisp_Object prop, pos; | |
1783 enum prop_handled handled = HANDLED_NORMALLY; | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1784 struct gcpro gcpro1; |
25012 | 1785 |
1786 /* Get the value of the `fontified' property at IT's current buffer | |
1787 position. (The `fontified' property doesn't have a special | |
1788 meaning in strings.) If the value is nil, call functions from | |
1789 Qfontification_functions. */ | |
1790 if (!STRINGP (it->string) | |
1791 && it->s == NULL | |
1792 && !NILP (Vfontification_functions) | |
1793 && (pos = make_number (IT_CHARPOS (*it)), | |
1794 prop = Fget_char_property (pos, Qfontified, Qnil), | |
1795 NILP (prop))) | |
1796 { | |
1797 Lisp_Object args[2]; | |
1798 | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1799 GCPRO1 (pos); |
25012 | 1800 /* Run the hook functions. */ |
1801 args[0] = Qfontification_functions; | |
1802 args[1] = pos; | |
1803 Frun_hook_with_args (make_number (2), args); | |
1804 | |
1805 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified | |
1806 something. This avoids an endless loop if they failed to | |
1807 fontify the text for which reason ever. */ | |
1808 if (!NILP (Fget_char_property (pos, Qfontified, Qnil))) | |
1809 handled = HANDLED_RECOMPUTE_PROPS; | |
26018
8e4c1c04059b
(handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents:
25882
diff
changeset
|
1810 UNGCPRO; |
25012 | 1811 } |
1812 | |
1813 return handled; | |
1814 } | |
1815 | |
1816 | |
1817 | |
1818 /*********************************************************************** | |
1819 Faces | |
1820 ***********************************************************************/ | |
1821 | |
1822 /* Set up iterator IT from face properties at its current position. | |
1823 Called from handle_stop. */ | |
1824 | |
1825 static enum prop_handled | |
1826 handle_face_prop (it) | |
1827 struct it *it; | |
1828 { | |
1829 int new_face_id, next_stop; | |
1830 | |
1831 if (!STRINGP (it->string)) | |
1832 { | |
1833 new_face_id | |
1834 = face_at_buffer_position (it->w, | |
1835 IT_CHARPOS (*it), | |
1836 it->region_beg_charpos, | |
1837 it->region_end_charpos, | |
1838 &next_stop, | |
1839 (IT_CHARPOS (*it) | |
1840 + TEXT_PROP_DISTANCE_LIMIT), | |
1841 0); | |
1842 | |
1843 /* Is this a start of a run of characters with box face? | |
1844 Caveat: this can be called for a freshly initialized | |
1845 iterator; face_id is -1 is this case. We know that the new | |
1846 face will not change until limit, i.e. if the new face has a | |
1847 box, all characters up to limit will have one. But, as | |
1848 usual, we don't know whether limit is really the end. */ | |
1849 if (new_face_id != it->face_id) | |
1850 { | |
1851 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1852 | |
1853 /* If new face has a box but old face has not, this is | |
1854 the start of a run of characters with box, i.e. it has | |
1855 a shadow on the left side. The value of face_id of the | |
1856 iterator will be -1 if this is the initial call that gets | |
1857 the face. In this case, we have to look in front of IT's | |
1858 position and see whether there is a face != new_face_id. */ | |
1859 it->start_of_box_run_p | |
1860 = (new_face->box != FACE_NO_BOX | |
1861 && (it->face_id >= 0 | |
1862 || IT_CHARPOS (*it) == BEG | |
1863 || new_face_id != face_before_it_pos (it))); | |
1864 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1865 } | |
1866 } | |
1867 else | |
1868 { | |
1869 new_face_id | |
1870 = face_at_string_position (it->w, | |
1871 it->string, | |
1872 IT_STRING_CHARPOS (*it), | |
1873 (it->current.overlay_string_index >= 0 | |
1874 ? IT_CHARPOS (*it) | |
1875 : 0), | |
1876 it->region_beg_charpos, | |
1877 it->region_end_charpos, | |
1878 &next_stop, | |
1879 it->base_face_id); | |
1880 | |
1881 #if 0 /* This shouldn't be neccessary. Let's check it. */ | |
1882 /* If IT is used to display a mode line we would really like to | |
1883 use the mode line face instead of the frame's default face. */ | |
1884 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | |
1885 && new_face_id == DEFAULT_FACE_ID) | |
1886 new_face_id = MODE_LINE_FACE_ID; | |
1887 #endif | |
1888 | |
1889 /* Is this a start of a run of characters with box? Caveat: | |
1890 this can be called for a freshly allocated iterator; face_id | |
1891 is -1 is this case. We know that the new face will not | |
1892 change until the next check pos, i.e. if the new face has a | |
1893 box, all characters up to that position will have a | |
1894 box. But, as usual, we don't know whether that position | |
1895 is really the end. */ | |
1896 if (new_face_id != it->face_id) | |
1897 { | |
1898 struct face *new_face = FACE_FROM_ID (it->f, new_face_id); | |
1899 struct face *old_face = FACE_FROM_ID (it->f, it->face_id); | |
1900 | |
1901 /* If new face has a box but old face hasn't, this is the | |
1902 start of a run of characters with box, i.e. it has a | |
1903 shadow on the left side. */ | |
1904 it->start_of_box_run_p | |
1905 = new_face->box && (old_face == NULL || !old_face->box); | |
1906 it->face_box_p = new_face->box != FACE_NO_BOX; | |
1907 } | |
1908 } | |
1909 | |
1910 it->face_id = new_face_id; | |
1911 it->charset = CHARSET_ASCII; | |
1912 return HANDLED_NORMALLY; | |
1913 } | |
1914 | |
1915 | |
1916 /* Compute the face one character before or after the current position | |
1917 of IT. BEFORE_P non-zero means get the face in front of IT's | |
1918 position. Value is the id of the face. */ | |
1919 | |
1920 static int | |
1921 face_before_or_after_it_pos (it, before_p) | |
1922 struct it *it; | |
1923 int before_p; | |
1924 { | |
1925 int face_id, limit; | |
1926 int next_check_charpos; | |
1927 struct text_pos pos; | |
1928 | |
1929 xassert (it->s == NULL); | |
1930 | |
1931 if (STRINGP (it->string)) | |
1932 { | |
1933 /* No face change past the end of the string (for the case | |
1934 we are padding with spaces). No face change before the | |
1935 string start. */ | |
1936 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size | |
1937 || (IT_STRING_CHARPOS (*it) == 0 && before_p)) | |
1938 return it->face_id; | |
1939 | |
1940 /* Set pos to the position before or after IT's current position. */ | |
1941 if (before_p) | |
1942 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string); | |
1943 else | |
1944 pos = string_pos (IT_STRING_CHARPOS (*it) + 1, it->string); | |
1945 | |
1946 /* Get the face for ASCII, or unibyte. */ | |
1947 face_id | |
1948 = face_at_string_position (it->w, | |
1949 it->string, | |
1950 CHARPOS (pos), | |
1951 (it->current.overlay_string_index >= 0 | |
1952 ? IT_CHARPOS (*it) | |
1953 : 0), | |
1954 it->region_beg_charpos, | |
1955 it->region_end_charpos, | |
1956 &next_check_charpos, | |
1957 it->base_face_id); | |
1958 | |
1959 /* Correct the face for charsets different from ASCII. Do it | |
1960 for the multibyte case only. The face returned above is | |
1961 suitable for unibyte text if IT->string is unibyte. */ | |
1962 if (STRING_MULTIBYTE (it->string)) | |
1963 { | |
1964 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos); | |
1965 int rest = STRING_BYTES (XSTRING (it->string)) - BYTEPOS (pos); | |
1966 int c, len, charset; | |
1967 | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
1968 c = string_char_and_length (p, rest, &len); |
25012 | 1969 charset = CHAR_CHARSET (c); |
1970 if (charset != CHARSET_ASCII) | |
1971 face_id = FACE_FOR_CHARSET (it->f, face_id, charset); | |
1972 } | |
1973 } | |
1974 else | |
1975 { | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1976 if ((IT_CHARPOS (*it) >= ZV && !before_p) |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1977 || (IT_CHARPOS (*it) <= BEGV && before_p)) |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1978 return it->face_id; |
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1979 |
25012 | 1980 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT; |
1981 pos = it->current.pos; | |
1982 | |
1983 if (before_p) | |
1984 DEC_TEXT_POS (pos); | |
1985 else | |
1986 INC_TEXT_POS (pos); | |
25242
28067247ff90
(face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents:
25197
diff
changeset
|
1987 |
25012 | 1988 /* Determine face for CHARSET_ASCII, or unibyte. */ |
1989 face_id = face_at_buffer_position (it->w, | |
1990 CHARPOS (pos), | |
1991 it->region_beg_charpos, | |
1992 it->region_end_charpos, | |
1993 &next_check_charpos, | |
1994 limit, 0); | |
1995 | |
1996 /* Correct the face for charsets different from ASCII. Do it | |
1997 for the multibyte case only. The face returned above is | |
1998 suitable for unibyte text if current_buffer is unibyte. */ | |
1999 if (it->multibyte_p) | |
2000 { | |
2001 int charset = charset_at_position (pos); | |
2002 if (charset != CHARSET_ASCII) | |
2003 face_id = FACE_FOR_CHARSET (it->f, face_id, charset); | |
2004 } | |
2005 } | |
2006 | |
2007 return face_id; | |
2008 } | |
2009 | |
2010 | |
2011 | |
2012 /*********************************************************************** | |
2013 Invisible text | |
2014 ***********************************************************************/ | |
2015 | |
2016 /* Set up iterator IT from invisible properties at its current | |
2017 position. Called from handle_stop. */ | |
2018 | |
2019 static enum prop_handled | |
2020 handle_invisible_prop (it) | |
2021 struct it *it; | |
2022 { | |
2023 enum prop_handled handled = HANDLED_NORMALLY; | |
2024 | |
2025 if (STRINGP (it->string)) | |
2026 { | |
2027 extern Lisp_Object Qinvisible; | |
2028 Lisp_Object prop, end_charpos, limit, charpos; | |
2029 | |
2030 /* Get the value of the invisible text property at the | |
2031 current position. Value will be nil if there is no such | |
2032 property. */ | |
2033 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it)); | |
2034 prop = Fget_text_property (charpos, Qinvisible, it->string); | |
2035 | |
2036 if (!NILP (prop)) | |
2037 { | |
2038 handled = HANDLED_RECOMPUTE_PROPS; | |
2039 | |
2040 /* Get the position at which the next change of the | |
2041 invisible text property can be found in IT->string. | |
2042 Value will be nil if the property value is the same for | |
2043 all the rest of IT->string. */ | |
2044 XSETINT (limit, XSTRING (it->string)->size); | |
2045 end_charpos = Fnext_single_property_change (charpos, Qinvisible, | |
2046 it->string, limit); | |
2047 | |
2048 /* Text at current position is invisible. The next | |
2049 change in the property is at position end_charpos. | |
2050 Move IT's current position to that position. */ | |
2051 if (INTEGERP (end_charpos) | |
2052 && XFASTINT (end_charpos) < XFASTINT (limit)) | |
2053 { | |
2054 struct text_pos old; | |
2055 old = it->current.string_pos; | |
2056 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos); | |
2057 compute_string_pos (&it->current.string_pos, old, it->string); | |
2058 } | |
2059 else | |
2060 { | |
2061 /* The rest of the string is invisible. If this is an | |
2062 overlay string, proceed with the next overlay string | |
2063 or whatever comes and return a character from there. */ | |
2064 if (it->current.overlay_string_index >= 0) | |
2065 { | |
2066 next_overlay_string (it); | |
2067 /* Don't check for overlay strings when we just | |
2068 finished processing them. */ | |
2069 handled = HANDLED_OVERLAY_STRING_CONSUMED; | |
2070 } | |
2071 else | |
2072 { | |
2073 struct Lisp_String *s = XSTRING (it->string); | |
2074 IT_STRING_CHARPOS (*it) = s->size; | |
2075 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s); | |
2076 } | |
2077 } | |
2078 } | |
2079 } | |
2080 else | |
2081 { | |
2082 int visible_p, newpos, next_stop; | |
2083 Lisp_Object pos, prop; | |
2084 | |
2085 /* First of all, is there invisible text at this position? */ | |
2086 XSETFASTINT (pos, IT_CHARPOS (*it)); | |
2087 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2088 | |
2089 /* If we are on invisible text, skip over it. */ | |
2090 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
2091 { | |
2092 /* Record whether we have to display an ellipsis for the | |
2093 invisible text. */ | |
2094 int display_ellipsis_p | |
2095 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop); | |
2096 | |
2097 handled = HANDLED_RECOMPUTE_PROPS; | |
2098 | |
2099 /* Loop skipping over invisible text. The loop is left at | |
2100 ZV or with IT on the first char being visible again. */ | |
2101 do | |
2102 { | |
2103 /* Try to skip some invisible text. Return value is the | |
2104 position reached which can be equal to IT's position | |
2105 if there is nothing invisible here. This skips both | |
2106 over invisible text properties and overlays with | |
2107 invisible property. */ | |
2108 newpos = skip_invisible (IT_CHARPOS (*it), | |
2109 &next_stop, ZV, it->window); | |
2110 | |
2111 /* If we skipped nothing at all we weren't at invisible | |
2112 text in the first place. If everything to the end of | |
2113 the buffer was skipped, end the loop. */ | |
2114 if (newpos == IT_CHARPOS (*it) || newpos >= ZV) | |
2115 visible_p = 1; | |
2116 else | |
2117 { | |
2118 /* We skipped some characters but not necessarily | |
2119 all there are. Check if we ended up on visible | |
2120 text. Fget_char_property returns the property of | |
2121 the char before the given position, i.e. if we | |
2122 get visible_p = 1, this means that the char at | |
2123 newpos is visible. */ | |
2124 XSETFASTINT (pos, newpos); | |
2125 prop = Fget_char_property (pos, Qinvisible, it->window); | |
2126 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop); | |
2127 } | |
2128 | |
2129 /* If we ended up on invisible text, proceed to | |
2130 skip starting with next_stop. */ | |
2131 if (!visible_p) | |
2132 IT_CHARPOS (*it) = next_stop; | |
2133 } | |
2134 while (!visible_p); | |
2135 | |
2136 /* The position newpos is now either ZV or on visible text. */ | |
2137 IT_CHARPOS (*it) = newpos; | |
2138 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); | |
2139 | |
2140 /* Maybe return `...' next for the end of the invisible text. */ | |
2141 if (display_ellipsis_p) | |
2142 { | |
2143 if (it->dp | |
2144 && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
2145 { | |
2146 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
2147 it->dpvec = v->contents; | |
2148 it->dpend = v->contents + v->size; | |
2149 } | |
2150 else | |
2151 { | |
2152 /* Default `...'. */ | |
2153 it->dpvec = default_invis_vector; | |
2154 it->dpend = default_invis_vector + 3; | |
2155 } | |
2156 | |
2157 /* The ellipsis display does not replace the display of | |
2158 the character at the new position. Indicate this by | |
2159 setting IT->dpvec_char_len to zero. */ | |
2160 it->dpvec_char_len = 0; | |
2161 | |
2162 it->current.dpvec_index = 0; | |
2163 it->method = next_element_from_display_vector; | |
2164 } | |
2165 } | |
2166 } | |
2167 | |
2168 return handled; | |
2169 } | |
2170 | |
2171 | |
277 | 2172 |
25012 | 2173 /*********************************************************************** |
2174 'display' property | |
2175 ***********************************************************************/ | |
2176 | |
2177 /* Set up iterator IT from `display' property at its current position. | |
2178 Called from handle_stop. */ | |
2179 | |
2180 static enum prop_handled | |
2181 handle_display_prop (it) | |
2182 struct it *it; | |
2183 { | |
2184 Lisp_Object prop, object; | |
2185 struct text_pos *position; | |
2186 int space_or_image_found_p; | |
2187 | |
2188 if (STRINGP (it->string)) | |
2189 { | |
2190 object = it->string; | |
2191 position = &it->current.string_pos; | |
2192 } | |
2193 else | |
2194 { | |
2195 object = Qnil; | |
2196 position = &it->current.pos; | |
2197 } | |
2198 | |
2199 /* Reset those iterator values set from display property values. */ | |
2200 it->font_height = Qnil; | |
2201 it->space_width = Qnil; | |
2202 it->voffset = 0; | |
2203 | |
2204 /* We don't support recursive `display' properties, i.e. string | |
2205 values that have a string `display' property, that have a string | |
2206 `display' property etc. */ | |
2207 if (!it->string_from_display_prop_p) | |
2208 it->area = TEXT_AREA; | |
2209 | |
2210 prop = Fget_char_property (make_number (position->charpos), | |
2211 Qdisplay, object); | |
2212 if (NILP (prop)) | |
2213 return HANDLED_NORMALLY; | |
2214 | |
2215 space_or_image_found_p = 0; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2216 if (CONSP (prop) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2217 && CONSP (XCAR (prop)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2218 && !EQ (Qmargin, XCAR (XCAR (prop)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2219 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2220 /* A list of sub-properties. */ |
25012 | 2221 while (CONSP (prop)) |
2222 { | |
2223 if (handle_single_display_prop (it, XCAR (prop), object, position)) | |
2224 space_or_image_found_p = 1; | |
2225 prop = XCDR (prop); | |
2226 } | |
2227 } | |
2228 else if (VECTORP (prop)) | |
2229 { | |
2230 int i; | |
2231 for (i = 0; i < XVECTOR (prop)->size; ++i) | |
2232 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i], | |
2233 object, position)) | |
2234 space_or_image_found_p = 1; | |
2235 } | |
2236 else | |
2237 { | |
2238 if (handle_single_display_prop (it, prop, object, position)) | |
2239 space_or_image_found_p = 1; | |
2240 } | |
2241 | |
2242 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY; | |
2243 } | |
2244 | |
2245 | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2246 /* Value is the position of the end of the `display' property starting |
25012 | 2247 at START_POS in OBJECT. */ |
2248 | |
2249 static struct text_pos | |
2250 display_prop_end (it, object, start_pos) | |
2251 struct it *it; | |
2252 Lisp_Object object; | |
2253 struct text_pos start_pos; | |
2254 { | |
2255 Lisp_Object end; | |
2256 struct text_pos end_pos; | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2257 |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2258 end = next_single_char_property_change (make_number (CHARPOS (start_pos)), |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2259 Qdisplay, object, Qnil); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2260 CHARPOS (end_pos) = XFASTINT (end); |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2261 if (STRINGP (object)) |
25012 | 2262 compute_string_pos (&end_pos, start_pos, it->string); |
2263 else | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
2264 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end)); |
25012 | 2265 |
2266 return end_pos; | |
2267 } | |
2268 | |
2269 | |
2270 /* Set up IT from a single `display' sub-property value PROP. OBJECT | |
2271 is the object in which the `display' property was found. *POSITION | |
2272 is the position at which it was found. | |
2273 | |
2274 If PROP is a `space' or `image' sub-property, set *POSITION to the | |
2275 end position of the `display' property. | |
2276 | |
2277 Value is non-zero if a `space' or `image' property value was found. */ | |
2278 | |
2279 static int | |
2280 handle_single_display_prop (it, prop, object, position) | |
2281 struct it *it; | |
2282 Lisp_Object prop; | |
2283 Lisp_Object object; | |
2284 struct text_pos *position; | |
2285 { | |
2286 Lisp_Object value; | |
2287 int space_or_image_found_p = 0; | |
2288 | |
2289 Lisp_Object form; | |
2290 | |
25614 | 2291 /* If PROP is a list of the form `(when FORM . VALUE)', FORM is |
25598
709e9cdaaab1
(handle_single_display_prop): Change conditional
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2292 evaluated. If the result is nil, VALUE is ignored. */ |
25012 | 2293 form = Qt; |
25614 | 2294 if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) |
25012 | 2295 { |
2296 prop = XCDR (prop); | |
2297 if (!CONSP (prop)) | |
2298 return 0; | |
2299 form = XCAR (prop); | |
2300 prop = XCDR (prop); | |
2301 } | |
2302 | |
2303 if (!NILP (form) && !EQ (form, Qt)) | |
2304 { | |
2305 struct gcpro gcpro1; | |
2306 struct text_pos end_pos, pt; | |
2307 | |
2308 end_pos = display_prop_end (it, object, *position); | |
2309 GCPRO1 (form); | |
2310 | |
2311 /* Temporarily set point to the end position, and then evaluate | |
2312 the form. This makes `(eolp)' work as FORM. */ | |
2313 CHARPOS (pt) = PT; | |
2314 BYTEPOS (pt) = PT_BYTE; | |
2315 TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos)); | |
2316 form = eval_form (form); | |
2317 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt)); | |
2318 UNGCPRO; | |
2319 } | |
2320 | |
2321 if (NILP (form)) | |
2322 return 0; | |
2323 | |
2324 if (CONSP (prop) | |
2325 && EQ (XCAR (prop), Qheight) | |
2326 && CONSP (XCDR (prop))) | |
2327 { | |
2328 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2329 return 0; | |
2330 | |
2331 /* `(height HEIGHT)'. */ | |
2332 it->font_height = XCAR (XCDR (prop)); | |
2333 if (!NILP (it->font_height)) | |
2334 { | |
2335 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2336 int new_height = -1; | |
2337 | |
2338 if (CONSP (it->font_height) | |
2339 && (EQ (XCAR (it->font_height), Qplus) | |
2340 || EQ (XCAR (it->font_height), Qminus)) | |
2341 && CONSP (XCDR (it->font_height)) | |
2342 && INTEGERP (XCAR (XCDR (it->font_height)))) | |
2343 { | |
2344 /* `(+ N)' or `(- N)' where N is an integer. */ | |
2345 int steps = XINT (XCAR (XCDR (it->font_height))); | |
2346 if (EQ (XCAR (it->font_height), Qplus)) | |
2347 steps = - steps; | |
2348 it->face_id = smaller_face (it->f, it->face_id, steps); | |
2349 } | |
2350 else if (SYMBOLP (it->font_height)) | |
2351 { | |
2352 /* Call function with current height as argument. | |
2353 Value is the new height. */ | |
2354 Lisp_Object form, height; | |
2355 struct gcpro gcpro1; | |
2356 | |
2357 height = face->lface[LFACE_HEIGHT_INDEX]; | |
2358 form = Fcons (it->font_height, Fcons (height, Qnil)); | |
2359 GCPRO1 (form); | |
2360 height = eval_form (form); | |
2361 if (NUMBERP (height)) | |
2362 new_height = XFLOATINT (height); | |
2363 UNGCPRO; | |
2364 } | |
2365 else if (NUMBERP (it->font_height)) | |
2366 { | |
2367 /* Value is a multiple of the canonical char height. */ | |
2368 struct face *face; | |
2369 | |
2370 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID); | |
2371 new_height = (XFLOATINT (it->font_height) | |
2372 * XINT (face->lface[LFACE_HEIGHT_INDEX])); | |
2373 } | |
2374 else | |
2375 { | |
2376 /* Evaluate IT->font_height with `height' bound to the | |
2377 current specified height to get the new height. */ | |
2378 Lisp_Object value; | |
2379 int count = specpdl_ptr - specpdl; | |
2380 | |
2381 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); | |
2382 value = eval_form (it->font_height); | |
2383 unbind_to (count, Qnil); | |
2384 | |
2385 if (NUMBERP (value)) | |
2386 new_height = XFLOATINT (value); | |
2387 } | |
2388 | |
2389 if (new_height > 0) | |
2390 it->face_id = face_with_height (it->f, it->face_id, new_height); | |
2391 } | |
2392 } | |
2393 else if (CONSP (prop) | |
2394 && EQ (XCAR (prop), Qspace_width) | |
2395 && CONSP (XCDR (prop))) | |
2396 { | |
2397 /* `(space_width WIDTH)'. */ | |
2398 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2399 return 0; | |
2400 | |
2401 value = XCAR (XCDR (prop)); | |
2402 if (NUMBERP (value) && XFLOATINT (value) > 0) | |
2403 it->space_width = value; | |
2404 } | |
2405 else if (CONSP (prop) | |
2406 && EQ (XCAR (prop), Qraise) | |
2407 && CONSP (XCDR (prop))) | |
2408 { | |
2409 #ifdef HAVE_WINDOW_SYSTEM | |
2410 /* `(raise FACTOR)'. */ | |
2411 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2412 return 0; | |
2413 | |
2414 value = XCAR (XCDR (prop)); | |
2415 if (NUMBERP (value)) | |
2416 { | |
2417 struct face *face = FACE_FROM_ID (it->f, it->face_id); | |
2418 it->voffset = - (XFLOATINT (value) | |
2419 * (face->font->ascent + face->font->descent)); | |
2420 } | |
2421 #endif /* HAVE_WINDOW_SYSTEM */ | |
2422 } | |
2423 else if (!it->string_from_display_prop_p) | |
2424 { | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2425 /* `((margin left-margin) VALUE)' or `((margin right-margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2426 VALUE) or `((margin nil) VALUE)' or VALUE. */ |
25012 | 2427 Lisp_Object location, value; |
2428 struct text_pos start_pos; | |
2429 int valid_p; | |
2430 | |
2431 /* Characters having this form of property are not displayed, so | |
2432 we have to find the end of the property. */ | |
2433 space_or_image_found_p = 1; | |
2434 start_pos = *position; | |
2435 *position = display_prop_end (it, object, start_pos); | |
2436 | |
2437 /* Let's stop at the new position and assume that all | |
2438 text properties change there. */ | |
2439 it->stop_charpos = position->charpos; | |
2440 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2441 location = Qunbound; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2442 if (CONSP (prop) && CONSP (XCAR (prop))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2443 { |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2444 Lisp_Object tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2445 |
25012 | 2446 value = XCDR (prop); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2447 if (CONSP (value)) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2448 value = XCAR (value); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2449 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2450 tem = XCAR (prop); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2451 if (EQ (XCAR (tem), Qmargin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2452 && (tem = XCDR (tem), |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2453 tem = CONSP (tem) ? XCAR (tem) : Qnil, |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2454 (NILP (tem) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2455 || EQ (tem, Qleft_margin) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2456 || EQ (tem, Qright_margin)))) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2457 location = tem; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2458 } |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2459 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
2460 if (EQ (location, Qunbound)) |
25012 | 2461 { |
2462 location = Qnil; | |
2463 value = prop; | |
2464 } | |
2465 | |
2466 #ifdef HAVE_WINDOW_SYSTEM | |
2467 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | |
2468 valid_p = STRINGP (value); | |
2469 else | |
2470 valid_p = (STRINGP (value) | |
2471 || (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2472 || valid_image_p (value)); | |
2473 #else /* not HAVE_WINDOW_SYSTEM */ | |
2474 valid_p = STRINGP (value); | |
2475 #endif /* not HAVE_WINDOW_SYSTEM */ | |
2476 | |
2477 if ((EQ (location, Qleft_margin) | |
2478 || EQ (location, Qright_margin) | |
2479 || NILP (location)) | |
2480 && valid_p) | |
2481 { | |
2482 /* Save current settings of IT so that we can restore them | |
2483 when we are finished with the glyph property value. */ | |
2484 push_it (it); | |
2485 | |
2486 if (NILP (location)) | |
2487 it->area = TEXT_AREA; | |
2488 else if (EQ (location, Qleft_margin)) | |
2489 it->area = LEFT_MARGIN_AREA; | |
2490 else | |
2491 it->area = RIGHT_MARGIN_AREA; | |
2492 | |
2493 if (STRINGP (value)) | |
2494 { | |
2495 it->string = value; | |
2496 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2497 it->current.overlay_string_index = -1; | |
2498 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2499 it->end_charpos = it->string_nchars | |
2500 = XSTRING (it->string)->size; | |
2501 it->method = next_element_from_string; | |
2502 it->stop_charpos = 0; | |
2503 it->string_from_display_prop_p = 1; | |
2504 } | |
2505 else if (CONSP (value) && EQ (XCAR (value), Qspace)) | |
2506 { | |
2507 it->method = next_element_from_stretch; | |
2508 it->object = value; | |
2509 it->current.pos = it->position = start_pos; | |
2510 } | |
2511 #ifdef HAVE_WINDOW_SYSTEM | |
2512 else | |
2513 { | |
2514 it->what = IT_IMAGE; | |
2515 it->image_id = lookup_image (it->f, value); | |
2516 it->position = start_pos; | |
2517 it->object = NILP (object) ? it->w->buffer : object; | |
2518 it->method = next_element_from_image; | |
2519 | |
2520 /* Say that we don't have consumed the characters with | |
2521 `display' property yet. The call to pop_it in | |
2522 set_iterator_to_next will clean this up. */ | |
2523 *position = start_pos; | |
2524 } | |
2525 #endif /* HAVE_WINDOW_SYSTEM */ | |
2526 } | |
2527 } | |
2528 | |
2529 return space_or_image_found_p; | |
2530 } | |
2531 | |
2532 | |
2533 | |
2534 /*********************************************************************** | |
2535 Overlay strings | |
2536 ***********************************************************************/ | |
2537 | |
2538 /* The following structure is used to record overlay strings for | |
2539 later sorting in load_overlay_strings. */ | |
2540 | |
2541 struct overlay_entry | |
2542 { | |
2543 Lisp_Object string; | |
2544 int priority; | |
2545 int after_string_p; | |
2546 }; | |
2547 | |
2548 | |
2549 /* Set up iterator IT from overlay strings at its current position. | |
2550 Called from handle_stop. */ | |
2551 | |
2552 static enum prop_handled | |
2553 handle_overlay_change (it) | |
2554 struct it *it; | |
2555 { | |
2556 /* Overlays are handled in current_buffer only. */ | |
2557 if (STRINGP (it->string)) | |
2558 return HANDLED_NORMALLY; | |
2559 else | |
2560 return (get_overlay_strings (it) | |
2561 ? HANDLED_RECOMPUTE_PROPS | |
2562 : HANDLED_NORMALLY); | |
2563 } | |
2564 | |
2565 | |
2566 /* Set up the next overlay string for delivery by IT, if there is an | |
2567 overlay string to deliver. Called by set_iterator_to_next when the | |
2568 end of the current overlay string is reached. If there are more | |
2569 overlay strings to display, IT->string and | |
2570 IT->current.overlay_string_index are set appropriately here. | |
2571 Otherwise IT->string is set to nil. */ | |
2572 | |
2573 static void | |
2574 next_overlay_string (it) | |
2575 struct it *it; | |
2576 { | |
2577 ++it->current.overlay_string_index; | |
2578 if (it->current.overlay_string_index == it->n_overlay_strings) | |
2579 { | |
2580 /* No more overlay strings. Restore IT's settings to what | |
2581 they were before overlay strings were processed, and | |
2582 continue to deliver from current_buffer. */ | |
2583 pop_it (it); | |
2584 xassert (it->stop_charpos >= BEGV | |
2585 && it->stop_charpos <= it->end_charpos); | |
2586 it->string = Qnil; | |
2587 it->current.overlay_string_index = -1; | |
2588 SET_TEXT_POS (it->current.string_pos, -1, -1); | |
2589 it->n_overlay_strings = 0; | |
2590 it->method = next_element_from_buffer; | |
2591 } | |
2592 else | |
2593 { | |
2594 /* There are more overlay strings to process. If | |
2595 IT->current.overlay_string_index has advanced to a position | |
2596 where we must load IT->overlay_strings with more strings, do | |
2597 it. */ | |
2598 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE; | |
2599 | |
2600 if (it->current.overlay_string_index && i == 0) | |
2601 load_overlay_strings (it); | |
2602 | |
2603 /* Initialize IT to deliver display elements from the overlay | |
2604 string. */ | |
2605 it->string = it->overlay_strings[i]; | |
2606 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2607 SET_TEXT_POS (it->current.string_pos, 0, 0); | |
2608 it->method = next_element_from_string; | |
2609 it->stop_charpos = 0; | |
2610 } | |
2611 | |
2612 CHECK_IT (it); | |
2613 } | |
2614 | |
2615 | |
2616 /* Compare two overlay_entry structures E1 and E2. Used as a | |
2617 comparison function for qsort in load_overlay_strings. Overlay | |
2618 strings for the same position are sorted so that | |
2619 | |
2620 1. All after-strings come in front of before-strings. | |
2621 | |
2622 2. Within after-strings, strings are sorted so that overlay strings | |
2623 from overlays with higher priorities come first. | |
2624 | |
2625 2. Within before-strings, strings are sorted so that overlay | |
2626 strings from overlays with higher priorities come last. | |
2627 | |
2628 Value is analogous to strcmp. */ | |
2629 | |
2630 | |
2631 static int | |
2632 compare_overlay_entries (e1, e2) | |
2633 void *e1, *e2; | |
2634 { | |
2635 struct overlay_entry *entry1 = (struct overlay_entry *) e1; | |
2636 struct overlay_entry *entry2 = (struct overlay_entry *) e2; | |
2637 int result; | |
2638 | |
2639 if (entry1->after_string_p != entry2->after_string_p) | |
2640 /* Let after-strings appear in front of before-strings. */ | |
2641 result = entry1->after_string_p ? -1 : 1; | |
2642 else if (entry1->after_string_p) | |
2643 /* After-strings sorted in order of decreasing priority. */ | |
2644 result = entry2->priority - entry1->priority; | |
2645 else | |
2646 /* Before-strings sorted in order of increasing priority. */ | |
2647 result = entry1->priority - entry2->priority; | |
2648 | |
2649 return result; | |
2650 } | |
2651 | |
2652 | |
2653 /* Load the vector IT->overlay_strings with overlay strings from IT's | |
2654 current buffer position. Set IT->n_overlays to the total number of | |
2655 overlay strings found. | |
2656 | |
2657 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at | |
2658 a time. On entry into load_overlay_strings, | |
2659 IT->current.overlay_string_index gives the number of overlay | |
2660 strings that have already been loaded by previous calls to this | |
2661 function. | |
2662 | |
2663 Overlay strings are sorted so that after-string strings come in | |
2664 front of before-string strings. Within before and after-strings, | |
2665 strings are sorted by overlay priority. See also function | |
2666 compare_overlay_entries. */ | |
2667 | |
2668 static void | |
2669 load_overlay_strings (it) | |
2670 struct it *it; | |
2671 { | |
2672 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority; | |
2673 Lisp_Object ov, overlay, window, str; | |
2674 int start, end; | |
2675 int size = 20; | |
2676 int n = 0, i, j; | |
2677 struct overlay_entry *entries | |
2678 = (struct overlay_entry *) alloca (size * sizeof *entries); | |
2679 | |
2680 /* Append the overlay string STRING of overlay OVERLAY to vector | |
2681 `entries' which has size `size' and currently contains `n' | |
2682 elements. AFTER_P non-zero means STRING is an after-string of | |
2683 OVERLAY. */ | |
2684 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \ | |
2685 do \ | |
2686 { \ | |
2687 Lisp_Object priority; \ | |
2688 \ | |
2689 if (n == size) \ | |
2690 { \ | |
2691 int new_size = 2 * size; \ | |
2692 struct overlay_entry *old = entries; \ | |
2693 entries = \ | |
2694 (struct overlay_entry *) alloca (new_size \ | |
2695 * sizeof *entries); \ | |
2696 bcopy (old, entries, size * sizeof *entries); \ | |
2697 size = new_size; \ | |
2698 } \ | |
2699 \ | |
2700 entries[n].string = (STRING); \ | |
2701 priority = Foverlay_get ((OVERLAY), Qpriority); \ | |
2702 entries[n].priority \ | |
2703 = INTEGERP (priority) ? XFASTINT (priority) : 0; \ | |
2704 entries[n].after_string_p = (AFTER_P); \ | |
2705 ++n; \ | |
2706 } \ | |
2707 while (0) | |
2708 | |
2709 /* Process overlay before the overlay center. */ | |
2710 for (ov = current_buffer->overlays_before; | |
2711 CONSP (ov); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2712 ov = XCDR (ov)) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2713 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2714 overlay = XCAR (ov); |
25012 | 2715 xassert (OVERLAYP (overlay)); |
2716 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
2717 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
2718 | |
2719 if (end < IT_CHARPOS (*it)) | |
2720 break; | |
2721 | |
2722 /* Skip this overlay if it doesn't start or end at IT's current | |
2723 position. */ | |
2724 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it)) | |
2725 continue; | |
2726 | |
2727 /* Skip this overlay if it doesn't apply to IT->w. */ | |
2728 window = Foverlay_get (overlay, Qwindow); | |
2729 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
2730 continue; | |
2731 | |
2732 /* If overlay has a non-empty before-string, record it. */ | |
2733 if (start == IT_CHARPOS (*it) | |
2734 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) | |
2735 && XSTRING (str)->size) | |
2736 RECORD_OVERLAY_STRING (overlay, str, 0); | |
2737 | |
2738 /* If overlay has a non-empty after-string, record it. */ | |
2739 if (end == IT_CHARPOS (*it) | |
2740 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
2741 && XSTRING (str)->size) | |
2742 RECORD_OVERLAY_STRING (overlay, str, 1); | |
2743 } | |
2744 | |
2745 /* Process overlays after the overlay center. */ | |
2746 for (ov = current_buffer->overlays_after; | |
2747 CONSP (ov); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2748 ov = XCDR (ov)) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2749 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
2750 overlay = XCAR (ov); |
25012 | 2751 xassert (OVERLAYP (overlay)); |
2752 start = OVERLAY_POSITION (OVERLAY_START (overlay)); | |
2753 end = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
2754 | |
2755 if (start > IT_CHARPOS (*it)) | |
2756 break; | |
2757 | |
2758 /* Skip this overlay if it doesn't start or end at IT's current | |
2759 position. */ | |
2760 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it)) | |
2761 continue; | |
2762 | |
2763 /* Skip this overlay if it doesn't apply to IT->w. */ | |
2764 window = Foverlay_get (overlay, Qwindow); | |
2765 if (WINDOWP (window) && XWINDOW (window) != it->w) | |
2766 continue; | |
2767 | |
2768 /* If overlay has a non-empty before-string, record it. */ | |
2769 if (start == IT_CHARPOS (*it) | |
2770 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)) | |
2771 && XSTRING (str)->size) | |
2772 RECORD_OVERLAY_STRING (overlay, str, 0); | |
2773 | |
2774 /* If overlay has a non-empty after-string, record it. */ | |
2775 if (end == IT_CHARPOS (*it) | |
2776 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)) | |
2777 && XSTRING (str)->size) | |
2778 RECORD_OVERLAY_STRING (overlay, str, 1); | |
2779 } | |
2780 | |
2781 #undef RECORD_OVERLAY_STRING | |
2782 | |
2783 /* Sort entries. */ | |
2784 qsort (entries, n, sizeof *entries, compare_overlay_entries); | |
2785 | |
2786 /* Record the total number of strings to process. */ | |
2787 it->n_overlay_strings = n; | |
2788 | |
2789 /* IT->current.overlay_string_index is the number of overlay strings | |
2790 that have already been consumed by IT. Copy some of the | |
2791 remaining overlay strings to IT->overlay_strings. */ | |
2792 i = 0; | |
2793 j = it->current.overlay_string_index; | |
2794 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | |
2795 it->overlay_strings[i++] = entries[j++].string; | |
2796 | |
2797 CHECK_IT (it); | |
2798 } | |
2799 | |
2800 | |
2801 /* Get the first chunk of overlay strings at IT's current buffer | |
2802 position. Value is non-zero if at least one overlay string was | |
2803 found. */ | |
2804 | |
2805 static int | |
2806 get_overlay_strings (it) | |
2807 struct it *it; | |
2808 { | |
2809 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to | |
2810 process. This fills IT->overlay_strings with strings, and sets | |
2811 IT->n_overlay_strings to the total number of strings to process. | |
2812 IT->pos.overlay_string_index has to be set temporarily to zero | |
2813 because load_overlay_strings needs this; it must be set to -1 | |
2814 when no overlay strings are found because a zero value would | |
2815 indicate a position in the first overlay string. */ | |
2816 it->current.overlay_string_index = 0; | |
2817 load_overlay_strings (it); | |
2818 | |
2819 /* If we found overlay strings, set up IT to deliver display | |
2820 elements from the first one. Otherwise set up IT to deliver | |
2821 from current_buffer. */ | |
2822 if (it->n_overlay_strings) | |
2823 { | |
2824 /* Make sure we know settings in current_buffer, so that we can | |
2825 restore meaningful values when we're done with the overlay | |
2826 strings. */ | |
2827 compute_stop_pos (it); | |
2828 xassert (it->face_id >= 0); | |
2829 | |
2830 /* Save IT's settings. They are restored after all overlay | |
2831 strings have been processed. */ | |
2832 xassert (it->sp == 0); | |
2833 push_it (it); | |
2834 | |
2835 /* Set up IT to deliver display elements from the first overlay | |
2836 string. */ | |
2837 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; | |
2838 it->stop_charpos = 0; | |
2839 it->string = it->overlay_strings[0]; | |
2840 it->multibyte_p = STRING_MULTIBYTE (it->string); | |
2841 xassert (STRINGP (it->string)); | |
2842 it->method = next_element_from_string; | |
2843 } | |
2844 else | |
2845 { | |
2846 it->string = Qnil; | |
2847 it->current.overlay_string_index = -1; | |
2848 it->method = next_element_from_buffer; | |
2849 } | |
2850 | |
2851 CHECK_IT (it); | |
2852 | |
2853 /* Value is non-zero if we found at least one overlay string. */ | |
2854 return STRINGP (it->string); | |
2855 } | |
2856 | |
2857 | |
2858 | |
2859 /*********************************************************************** | |
2860 Saving and restoring state | |
2861 ***********************************************************************/ | |
2862 | |
2863 /* Save current settings of IT on IT->stack. Called, for example, | |
2864 before setting up IT for an overlay string, to be able to restore | |
2865 IT's settings to what they were after the overlay string has been | |
2866 processed. */ | |
2867 | |
2868 static void | |
2869 push_it (it) | |
2870 struct it *it; | |
2871 { | |
2872 struct iterator_stack_entry *p; | |
2873 | |
2874 xassert (it->sp < 2); | |
2875 p = it->stack + it->sp; | |
2876 | |
2877 p->stop_charpos = it->stop_charpos; | |
2878 xassert (it->face_id >= 0); | |
2879 p->face_id = it->face_id; | |
2880 p->string = it->string; | |
2881 p->pos = it->current; | |
2882 p->end_charpos = it->end_charpos; | |
2883 p->string_nchars = it->string_nchars; | |
2884 p->area = it->area; | |
2885 p->multibyte_p = it->multibyte_p; | |
2886 p->space_width = it->space_width; | |
2887 p->font_height = it->font_height; | |
2888 p->voffset = it->voffset; | |
2889 p->string_from_display_prop_p = it->string_from_display_prop_p; | |
2890 ++it->sp; | |
2891 } | |
2892 | |
2893 | |
2894 /* Restore IT's settings from IT->stack. Called, for example, when no | |
2895 more overlay strings must be processed, and we return to delivering | |
2896 display elements from a buffer, or when the end of a string from a | |
2897 `display' property is reached and we return to delivering display | |
2898 elements from an overlay string, or from a buffer. */ | |
2899 | |
2900 static void | |
2901 pop_it (it) | |
2902 struct it *it; | |
2903 { | |
2904 struct iterator_stack_entry *p; | |
2905 | |
2906 xassert (it->sp > 0); | |
2907 --it->sp; | |
2908 p = it->stack + it->sp; | |
2909 it->stop_charpos = p->stop_charpos; | |
2910 it->face_id = p->face_id; | |
2911 it->string = p->string; | |
2912 it->current = p->pos; | |
2913 it->end_charpos = p->end_charpos; | |
2914 it->string_nchars = p->string_nchars; | |
2915 it->area = p->area; | |
2916 it->multibyte_p = p->multibyte_p; | |
2917 it->space_width = p->space_width; | |
2918 it->font_height = p->font_height; | |
2919 it->voffset = p->voffset; | |
2920 it->string_from_display_prop_p = p->string_from_display_prop_p; | |
2921 } | |
2922 | |
2923 | |
2924 | |
2925 /*********************************************************************** | |
2926 Moving over lines | |
2927 ***********************************************************************/ | |
2928 | |
2929 /* Set IT's current position to the previous line start. */ | |
2930 | |
2931 static void | |
2932 back_to_previous_line_start (it) | |
2933 struct it *it; | |
2934 { | |
2935 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1); | |
2936 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
2937 } | |
2938 | |
2939 | |
2940 /* Set IT's current position to the next line start. */ | |
2941 | |
2942 static void | |
2943 forward_to_next_line_start (it) | |
2944 struct it *it; | |
2945 { | |
2946 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), 1); | |
2947 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); | |
2948 } | |
2949 | |
2950 | |
2951 /* Set IT's current position to the previous visible line start. Skip | |
2952 invisible text that is so either due to text properties or due to | |
2953 selective display. Caution: this does not change IT->current_x and | |
2954 IT->hpos. */ | |
2955 | |
2956 static void | |
2957 back_to_previous_visible_line_start (it) | |
2958 struct it *it; | |
2959 { | |
2960 int visible_p = 0; | |
2961 | |
2962 /* Go back one newline if not on BEGV already. */ | |
2963 if (IT_CHARPOS (*it) > BEGV) | |
2964 back_to_previous_line_start (it); | |
2965 | |
2966 /* Move over lines that are invisible because of selective display | |
2967 or text properties. */ | |
2968 while (IT_CHARPOS (*it) > BEGV | |
2969 && !visible_p) | |
2970 { | |
2971 visible_p = 1; | |
2972 | |
2973 /* If selective > 0, then lines indented more than that values | |
2974 are invisible. */ | |
2975 if (it->selective > 0 | |
2976 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
2977 it->selective)) | |
2978 visible_p = 0; | |
2979 #ifdef USE_TEXT_PROPERTIES | |
2980 else | |
2981 { | |
2982 Lisp_Object prop; | |
2983 | |
2984 prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window); | |
2985 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
2986 visible_p = 0; | |
2987 } | |
2988 #endif /* USE_TEXT_PROPERTIES */ | |
2989 | |
2990 /* Back one more newline if the current one is invisible. */ | |
2991 if (!visible_p) | |
2992 back_to_previous_line_start (it); | |
2993 } | |
2994 | |
2995 xassert (IT_CHARPOS (*it) >= BEGV); | |
2996 xassert (IT_CHARPOS (*it) == BEGV | |
2997 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
2998 CHECK_IT (it); | |
2999 } | |
3000 | |
3001 | |
3002 /* Reseat iterator IT at the previous visible line start. Skip | |
3003 invisible text that is so either due to text properties or due to | |
3004 selective display. At the end, update IT's overlay information, | |
3005 face information etc. */ | |
3006 | |
3007 static void | |
3008 reseat_at_previous_visible_line_start (it) | |
3009 struct it *it; | |
3010 { | |
3011 back_to_previous_visible_line_start (it); | |
3012 reseat (it, it->current.pos, 1); | |
3013 CHECK_IT (it); | |
3014 } | |
3015 | |
3016 | |
3017 /* Reseat iterator IT on the next visible line start in the current | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3018 buffer. ON_NEWLINE_P non-zero means position IT on the newline |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3019 preceding the line start. Skip over invisible text that is so |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3020 because of selective display. Compute faces, overlays etc at the |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3021 new position. Note that this function does not skip over text that |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3022 is invisible because of text properties. */ |
25012 | 3023 |
3024 static void | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3025 reseat_at_next_visible_line_start (it, on_newline_p) |
25012 | 3026 struct it *it; |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3027 int on_newline_p; |
25012 | 3028 { |
3029 /* Restore the buffer position when currently not delivering display | |
3030 elements from the current buffer. This is the case, for example, | |
3031 when called at the end of a truncated overlay string. */ | |
3032 while (it->sp) | |
3033 pop_it (it); | |
3034 it->method = next_element_from_buffer; | |
3035 | |
3036 /* Otherwise, scan_buffer would not work. */ | |
3037 if (IT_CHARPOS (*it) < ZV) | |
3038 { | |
3039 /* If on a newline, advance past it. Otherwise, find the next | |
3040 newline which automatically gives us the position following | |
3041 the newline. */ | |
3042 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n') | |
3043 { | |
3044 ++IT_CHARPOS (*it); | |
3045 ++IT_BYTEPOS (*it); | |
3046 } | |
3047 else | |
3048 forward_to_next_line_start (it); | |
3049 | |
3050 /* We must either have reached the end of the buffer or end up | |
3051 after a newline. */ | |
3052 xassert (IT_CHARPOS (*it) == ZV | |
3053 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | |
3054 | |
3055 /* Skip over lines that are invisible because they are indented | |
3056 more than the value of IT->selective. */ | |
3057 if (it->selective > 0) | |
3058 while (IT_CHARPOS (*it) < ZV | |
3059 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | |
3060 it->selective)) | |
3061 forward_to_next_line_start (it); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3062 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3063 /* Position on the newline if we should. */ |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3064 if (on_newline_p && IT_CHARPOS (*it) > BEGV) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3065 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3066 --IT_CHARPOS (*it); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3067 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it)); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3068 } |
25012 | 3069 |
3070 /* Set the iterator there. The 0 as the last parameter of | |
3071 reseat means don't force a text property lookup. The lookup | |
3072 is then only done if we've skipped past the iterator's | |
3073 check_charpos'es. This optimization is important because | |
3074 text property lookups tend to be expensive. */ | |
3075 reseat (it, it->current.pos, 0); | |
3076 } | |
3077 | |
3078 CHECK_IT (it); | |
3079 } | |
3080 | |
3081 | |
3082 | |
3083 /*********************************************************************** | |
3084 Changing an iterator's position | |
3085 ***********************************************************************/ | |
3086 | |
3087 /* Change IT's current position to POS in current_buffer. If FORCE_P | |
3088 is non-zero, always check for text properties at the new position. | |
3089 Otherwise, text properties are only looked up if POS >= | |
3090 IT->check_charpos of a property. */ | |
3091 | |
3092 static void | |
3093 reseat (it, pos, force_p) | |
3094 struct it *it; | |
3095 struct text_pos pos; | |
3096 int force_p; | |
3097 { | |
3098 int original_pos = IT_CHARPOS (*it); | |
3099 | |
3100 reseat_1 (it, pos, 0); | |
3101 | |
3102 /* Determine where to check text properties. Avoid doing it | |
3103 where possible because text property lookup is very expensive. */ | |
3104 if (force_p | |
3105 || CHARPOS (pos) > it->stop_charpos | |
3106 || CHARPOS (pos) < original_pos) | |
3107 handle_stop (it); | |
3108 | |
3109 CHECK_IT (it); | |
3110 } | |
3111 | |
3112 | |
3113 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set | |
3114 IT->stop_pos to POS, also. */ | |
3115 | |
3116 static void | |
3117 reseat_1 (it, pos, set_stop_p) | |
3118 struct it *it; | |
3119 struct text_pos pos; | |
3120 int set_stop_p; | |
3121 { | |
3122 /* Don't call this function when scanning a C string. */ | |
3123 xassert (it->s == NULL); | |
3124 | |
3125 /* POS must be a reasonable value. */ | |
3126 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV); | |
3127 | |
3128 it->current.pos = it->position = pos; | |
3129 XSETBUFFER (it->object, current_buffer); | |
3130 it->dpvec = NULL; | |
3131 it->current.dpvec_index = -1; | |
3132 it->current.overlay_string_index = -1; | |
3133 IT_STRING_CHARPOS (*it) = -1; | |
3134 IT_STRING_BYTEPOS (*it) = -1; | |
3135 it->string = Qnil; | |
3136 it->method = next_element_from_buffer; | |
3137 it->sp = 0; | |
3138 | |
3139 if (set_stop_p) | |
3140 it->stop_charpos = CHARPOS (pos); | |
3141 } | |
3142 | |
3143 | |
3144 /* Set up IT for displaying a string, starting at CHARPOS in window W. | |
3145 If S is non-null, it is a C string to iterate over. Otherwise, | |
3146 STRING gives a Lisp string to iterate over. | |
3147 | |
3148 If PRECISION > 0, don't return more then PRECISION number of | |
3149 characters from the string. | |
3150 | |
3151 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH | |
3152 characters have been returned. FIELD_WIDTH < 0 means an infinite | |
3153 field width. | |
3154 | |
3155 MULTIBYTE = 0 means disable processing of multibyte characters, | |
3156 MULTIBYTE > 0 means enable it, | |
3157 MULTIBYTE < 0 means use IT->multibyte_p. | |
3158 | |
3159 IT must be initialized via a prior call to init_iterator before | |
3160 calling this function. */ | |
3161 | |
3162 static void | |
3163 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |
3164 struct it *it; | |
3165 unsigned char *s; | |
3166 Lisp_Object string; | |
3167 int charpos; | |
3168 int precision, field_width, multibyte; | |
3169 { | |
3170 /* No region in strings. */ | |
3171 it->region_beg_charpos = it->region_end_charpos = -1; | |
3172 | |
3173 /* No text property checks performed by default, but see below. */ | |
3174 it->stop_charpos = -1; | |
3175 | |
3176 /* Set iterator position and end position. */ | |
3177 bzero (&it->current, sizeof it->current); | |
3178 it->current.overlay_string_index = -1; | |
3179 it->current.dpvec_index = -1; | |
3180 it->charset = CHARSET_ASCII; | |
3181 xassert (charpos >= 0); | |
3182 | |
3183 /* Use the setting of MULTIBYTE if specified. */ | |
3184 if (multibyte >= 0) | |
3185 it->multibyte_p = multibyte > 0; | |
3186 | |
3187 if (s == NULL) | |
3188 { | |
3189 xassert (STRINGP (string)); | |
3190 it->string = string; | |
3191 it->s = NULL; | |
3192 it->end_charpos = it->string_nchars = XSTRING (string)->size; | |
3193 it->method = next_element_from_string; | |
3194 it->current.string_pos = string_pos (charpos, string); | |
3195 } | |
3196 else | |
3197 { | |
3198 it->s = s; | |
3199 it->string = Qnil; | |
3200 | |
3201 /* Note that we use IT->current.pos, not it->current.string_pos, | |
3202 for displaying C strings. */ | |
3203 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1; | |
3204 if (it->multibyte_p) | |
3205 { | |
3206 it->current.pos = c_string_pos (charpos, s, 1); | |
3207 it->end_charpos = it->string_nchars = number_of_chars (s, 1); | |
3208 } | |
3209 else | |
3210 { | |
3211 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos; | |
3212 it->end_charpos = it->string_nchars = strlen (s); | |
3213 } | |
3214 | |
3215 it->method = next_element_from_c_string; | |
3216 } | |
3217 | |
3218 /* PRECISION > 0 means don't return more than PRECISION characters | |
3219 from the string. */ | |
3220 if (precision > 0 && it->end_charpos - charpos > precision) | |
3221 it->end_charpos = it->string_nchars = charpos + precision; | |
3222 | |
3223 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH | |
3224 characters have been returned. FIELD_WIDTH == 0 means don't pad, | |
3225 FIELD_WIDTH < 0 means infinite field width. This is useful for | |
3226 padding with `-' at the end of a mode line. */ | |
3227 if (field_width < 0) | |
3228 field_width = INFINITY; | |
3229 if (field_width > it->end_charpos - charpos) | |
3230 it->end_charpos = charpos + field_width; | |
3231 | |
3232 /* Use the standard display table for displaying strings. */ | |
3233 if (DISP_TABLE_P (Vstandard_display_table)) | |
3234 it->dp = XCHAR_TABLE (Vstandard_display_table); | |
3235 | |
3236 it->stop_charpos = charpos; | |
3237 CHECK_IT (it); | |
3238 } | |
3239 | |
3240 | |
3241 | |
3242 /*********************************************************************** | |
3243 Iteration | |
3244 ***********************************************************************/ | |
3245 | |
3246 /* Load IT's display element fields with information about the next | |
3247 display element from the current position of IT. Value is zero if | |
3248 end of buffer (or C string) is reached. */ | |
3249 | |
3250 int | |
3251 get_next_display_element (it) | |
3252 struct it *it; | |
3253 { | |
3254 /* Non-zero means that we found an display element. Zero means that | |
3255 we hit the end of what we iterate over. Performance note: the | |
3256 function pointer `method' used here turns out to be faster than | |
3257 using a sequence of if-statements. */ | |
3258 int success_p = (*it->method) (it); | |
3259 int charset; | |
3260 | |
3261 if (it->what == IT_CHARACTER) | |
3262 { | |
3263 /* Map via display table or translate control characters. | |
3264 IT->c, IT->len etc. have been set to the next character by | |
3265 the function call above. If we have a display table, and it | |
3266 contains an entry for IT->c, translate it. Don't do this if | |
3267 IT->c itself comes from a display table, otherwise we could | |
3268 end up in an infinite recursion. (An alternative could be to | |
3269 count the recursion depth of this function and signal an | |
3270 error when a certain maximum depth is reached.) Is it worth | |
3271 it? */ | |
3272 if (success_p && it->dpvec == NULL) | |
3273 { | |
3274 Lisp_Object dv; | |
3275 | |
3276 if (it->dp | |
3277 && (dv = DISP_CHAR_VECTOR (it->dp, it->c), | |
3278 VECTORP (dv))) | |
3279 { | |
3280 struct Lisp_Vector *v = XVECTOR (dv); | |
3281 | |
3282 /* Return the first character from the display table | |
3283 entry, if not empty. If empty, don't display the | |
3284 current character. */ | |
3285 if (v->size) | |
3286 { | |
3287 it->dpvec_char_len = it->len; | |
3288 it->dpvec = v->contents; | |
3289 it->dpend = v->contents + v->size; | |
3290 it->current.dpvec_index = 0; | |
3291 it->method = next_element_from_display_vector; | |
3292 } | |
3293 | |
3294 success_p = get_next_display_element (it); | |
3295 } | |
3296 | |
3297 /* Translate control characters into `\003' or `^C' form. | |
3298 Control characters coming from a display table entry are | |
3299 currently not translated because we use IT->dpvec to hold | |
3300 the translation. This could easily be changed but I | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3301 don't believe that it is worth doing. |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3302 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3303 Non-printable multibyte characters are also translated |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3304 octal form. */ |
25012 | 3305 else if ((it->c < ' ' |
3306 && (it->area != TEXT_AREA | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
3307 || (it->c != '\n' && it->c != '\t'))) |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3308 || (it->c >= 127 |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3309 && it->len == 1) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3310 || !CHAR_PRINTABLE_P (it->c)) |
25012 | 3311 { |
3312 /* IT->c is a control character which must be displayed | |
3313 either as '\003' or as `^C' where the '\\' and '^' | |
3314 can be defined in the display table. Fill | |
3315 IT->ctl_chars with glyphs for what we have to | |
3316 display. Then, set IT->dpvec to these glyphs. */ | |
3317 GLYPH g; | |
3318 | |
25063
7c69e1001e35
(get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents:
25012
diff
changeset
|
3319 if (it->c < 128 && it->ctl_arrow_p) |
25012 | 3320 { |
3321 /* Set IT->ctl_chars[0] to the glyph for `^'. */ | |
3322 if (it->dp | |
3323 && INTEGERP (DISP_CTRL_GLYPH (it->dp)) | |
3324 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp)))) | |
3325 g = XINT (DISP_CTRL_GLYPH (it->dp)); | |
3326 else | |
3327 g = FAST_MAKE_GLYPH ('^', 0); | |
3328 XSETINT (it->ctl_chars[0], g); | |
3329 | |
3330 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0); | |
3331 XSETINT (it->ctl_chars[1], g); | |
3332 | |
3333 /* Set up IT->dpvec and return first character from it. */ | |
3334 it->dpvec_char_len = it->len; | |
3335 it->dpvec = it->ctl_chars; | |
3336 it->dpend = it->dpvec + 2; | |
3337 it->current.dpvec_index = 0; | |
3338 it->method = next_element_from_display_vector; | |
3339 get_next_display_element (it); | |
3340 } | |
3341 else | |
3342 { | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3343 unsigned char work[4], *str; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3344 int len = CHAR_STRING (it->c, work, str); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3345 int i; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3346 GLYPH escape_glyph; |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3347 |
25012 | 3348 /* Set IT->ctl_chars[0] to the glyph for `\\'. */ |
3349 if (it->dp | |
3350 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) | |
3351 && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp)))) | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3352 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp)); |
25012 | 3353 else |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3354 escape_glyph = FAST_MAKE_GLYPH ('\\', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3355 |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3356 for (i = 0; i < len; i++) |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3357 { |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3358 XSETINT (it->ctl_chars[i * 4], escape_glyph); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3359 /* Insert three more glyphs into IT->ctl_chars for |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3360 the octal display of the character. */ |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3361 g = FAST_MAKE_GLYPH (((str[i] >> 6) & 7) + '0', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3362 XSETINT (it->ctl_chars[i * 4 + 1], g); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3363 g = FAST_MAKE_GLYPH (((str[i] >> 3) & 7) + '0', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3364 XSETINT (it->ctl_chars[i * 4 + 2], g); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3365 g = FAST_MAKE_GLYPH ((str[i] & 7) + '0', 0); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3366 XSETINT (it->ctl_chars[i * 4 + 3], g); |
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3367 } |
25012 | 3368 |
3369 /* Set up IT->dpvec and return the first character | |
3370 from it. */ | |
3371 it->dpvec_char_len = it->len; | |
3372 it->dpvec = it->ctl_chars; | |
25500
156172362ea9
(get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents:
25493
diff
changeset
|
3373 it->dpend = it->dpvec + len * 4; |
25012 | 3374 it->current.dpvec_index = 0; |
3375 it->method = next_element_from_display_vector; | |
3376 get_next_display_element (it); | |
3377 } | |
3378 } | |
3379 } | |
3380 | |
3381 /* Adjust face id if charset changes. There are no charset | |
3382 changes in unibyte text because Emacs' charsets are not | |
3383 applicable there. */ | |
3384 if (it->multibyte_p | |
3385 && success_p | |
3386 && (charset = CHAR_CHARSET (it->c), | |
3387 charset != it->charset)) | |
3388 { | |
3389 it->charset = charset; | |
3390 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, charset); | |
3391 } | |
3392 } | |
3393 | |
3394 /* Is this character the last one of a run of characters with | |
3395 box? If yes, set IT->end_of_box_run_p to 1. */ | |
3396 if (it->face_box_p | |
3397 && it->s == NULL) | |
3398 { | |
3399 int face_id; | |
3400 struct face *face; | |
3401 | |
3402 it->end_of_box_run_p | |
3403 = ((face_id = face_after_it_pos (it), | |
3404 face_id != it->face_id) | |
3405 && (face = FACE_FROM_ID (it->f, face_id), | |
3406 face->box == FACE_NO_BOX)); | |
3407 } | |
3408 | |
3409 /* Value is 0 if end of buffer or string reached. */ | |
3410 return success_p; | |
3411 } | |
3412 | |
3413 | |
3414 /* Move IT to the next display element. | |
3415 | |
3416 Functions get_next_display_element and set_iterator_to_next are | |
3417 separate because I find this arrangement easier to handle than a | |
3418 get_next_display_element function that also increments IT's | |
3419 position. The way it is we can first look at an iterator's current | |
3420 display element, decide whether it fits on a line, and if it does, | |
3421 increment the iterator position. The other way around we probably | |
3422 would either need a flag indicating whether the iterator has to be | |
3423 incremented the next time, or we would have to implement a | |
3424 decrement position function which would not be easy to write. */ | |
3425 | |
3426 void | |
3427 set_iterator_to_next (it) | |
3428 struct it *it; | |
3429 { | |
3430 if (it->method == next_element_from_buffer) | |
3431 { | |
3432 /* The current display element of IT is a character from | |
3433 current_buffer. Advance in the buffer, and maybe skip over | |
3434 invisible lines that are so because of selective display. */ | |
3435 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3436 reseat_at_next_visible_line_start (it, 0); |
25012 | 3437 else |
3438 { | |
3439 xassert (it->len != 0); | |
3440 IT_BYTEPOS (*it) += it->len; | |
3441 IT_CHARPOS (*it) += 1; | |
3442 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it))); | |
3443 } | |
3444 } | |
3445 else if (it->method == next_element_from_c_string) | |
3446 { | |
3447 /* Current display element of IT is from a C string. */ | |
3448 IT_BYTEPOS (*it) += it->len; | |
3449 IT_CHARPOS (*it) += 1; | |
3450 } | |
3451 else if (it->method == next_element_from_display_vector) | |
3452 { | |
3453 /* Current display element of IT is from a display table entry. | |
3454 Advance in the display table definition. Reset it to null if | |
3455 end reached, and continue with characters from buffers/ | |
3456 strings. */ | |
3457 ++it->current.dpvec_index; | |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3458 |
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3459 /* Restore face and charset of the iterator to what they were |
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3460 before the display vector entry (these entries may contain |
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3461 faces, and of course characters of different charsets). */ |
25012 | 3462 it->face_id = it->saved_face_id; |
25197
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3463 it->charset = FACE_FROM_ID (it->f, it->face_id)->charset; |
fbe149852f1c
(set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents:
25188
diff
changeset
|
3464 |
25012 | 3465 if (it->dpvec + it->current.dpvec_index == it->dpend) |
3466 { | |
3467 if (it->s) | |
3468 it->method = next_element_from_c_string; | |
3469 else if (STRINGP (it->string)) | |
3470 it->method = next_element_from_string; | |
3471 else | |
3472 it->method = next_element_from_buffer; | |
3473 | |
3474 it->dpvec = NULL; | |
3475 it->current.dpvec_index = -1; | |
3476 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3477 /* Skip over characters which were displayed via IT->dpvec. */ |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3478 if (it->dpvec_char_len < 0) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3479 reseat_at_next_visible_line_start (it, 1); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3480 else if (it->dpvec_char_len > 0) |
25012 | 3481 { |
3482 it->len = it->dpvec_char_len; | |
3483 set_iterator_to_next (it); | |
3484 } | |
3485 } | |
3486 } | |
3487 else if (it->method == next_element_from_string) | |
3488 { | |
3489 /* Current display element is a character from a Lisp string. */ | |
3490 xassert (it->s == NULL && STRINGP (it->string)); | |
3491 IT_STRING_BYTEPOS (*it) += it->len; | |
3492 IT_STRING_CHARPOS (*it) += 1; | |
3493 | |
3494 consider_string_end: | |
3495 | |
3496 if (it->current.overlay_string_index >= 0) | |
3497 { | |
3498 /* IT->string is an overlay string. Advance to the | |
3499 next, if there is one. */ | |
3500 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3501 next_overlay_string (it); | |
3502 } | |
3503 else | |
3504 { | |
3505 /* IT->string is not an overlay string. If we reached | |
3506 its end, and there is something on IT->stack, proceed | |
3507 with what is on the stack. This can be either another | |
3508 string, this time an overlay string, or a buffer. */ | |
3509 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size | |
3510 && it->sp > 0) | |
3511 { | |
3512 pop_it (it); | |
3513 if (!STRINGP (it->string)) | |
3514 it->method = next_element_from_buffer; | |
3515 } | |
3516 } | |
3517 } | |
3518 else if (it->method == next_element_from_image | |
3519 || it->method == next_element_from_stretch) | |
3520 { | |
3521 /* The position etc with which we have to proceed are on | |
3522 the stack. The position may be at the end of a string, | |
3523 if the `display' property takes up the whole string. */ | |
3524 pop_it (it); | |
3525 it->image_id = 0; | |
3526 if (STRINGP (it->string)) | |
3527 { | |
3528 it->method = next_element_from_string; | |
3529 goto consider_string_end; | |
3530 } | |
3531 else | |
3532 it->method = next_element_from_buffer; | |
3533 } | |
3534 else | |
3535 /* There are no other methods defined, so this should be a bug. */ | |
3536 abort (); | |
3537 | |
3538 /* Reset flags indicating start and end of a sequence of | |
3539 characters with box. */ | |
3540 it->start_of_box_run_p = it->end_of_box_run_p = 0; | |
3541 | |
3542 xassert (it->method != next_element_from_string | |
3543 || (STRINGP (it->string) | |
3544 && IT_STRING_CHARPOS (*it) >= 0)); | |
3545 } | |
3546 | |
3547 | |
3548 /* Load IT's display element fields with information about the next | |
3549 display element which comes from a display table entry or from the | |
3550 result of translating a control character to one of the forms `^C' | |
3551 or `\003'. IT->dpvec holds the glyphs to return as characters. */ | |
3552 | |
3553 static int | |
3554 next_element_from_display_vector (it) | |
3555 struct it *it; | |
3556 { | |
3557 /* Precondition. */ | |
3558 xassert (it->dpvec && it->current.dpvec_index >= 0); | |
3559 | |
3560 /* Remember the current face id in case glyphs specify faces. | |
3561 IT's face is restored in set_iterator_to_next. */ | |
3562 it->saved_face_id = it->face_id; | |
3563 | |
3564 if (INTEGERP (*it->dpvec) | |
3565 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec))) | |
3566 { | |
3567 int lface_id; | |
3568 GLYPH g; | |
3569 | |
3570 g = XFASTINT (it->dpvec[it->current.dpvec_index]); | |
3571 it->c = FAST_GLYPH_CHAR (g); | |
3572 it->len = CHAR_LEN (it->c); | |
3573 | |
3574 /* The entry may contain a face id to use. Such a face id is | |
3575 the id of a Lisp face, not a realized face. A face id of | |
3576 zero means no face. */ | |
3577 lface_id = FAST_GLYPH_FACE (g); | |
3578 if (lface_id) | |
3579 { | |
3580 int face_id = ascii_face_of_lisp_face (it->f, lface_id); | |
3581 if (face_id >= 0) | |
3582 { | |
3583 it->face_id = face_id; | |
3584 it->charset = CHARSET_ASCII; | |
3585 } | |
3586 } | |
3587 } | |
3588 else | |
3589 /* Display table entry is invalid. Return a space. */ | |
3590 it->c = ' ', it->len = 1; | |
3591 | |
3592 /* Don't change position and object of the iterator here. They are | |
3593 still the values of the character that had this display table | |
3594 entry or was translated, and that's what we want. */ | |
3595 it->what = IT_CHARACTER; | |
3596 return 1; | |
3597 } | |
3598 | |
3599 | |
3600 /* Load IT with the next display element from Lisp string IT->string. | |
3601 IT->current.string_pos is the current position within the string. | |
3602 If IT->current.overlay_string_index >= 0, the Lisp string is an | |
3603 overlay string. */ | |
3604 | |
3605 static int | |
3606 next_element_from_string (it) | |
3607 struct it *it; | |
3608 { | |
3609 struct text_pos position; | |
3610 | |
3611 xassert (STRINGP (it->string)); | |
3612 xassert (IT_STRING_CHARPOS (*it) >= 0); | |
3613 position = it->current.string_pos; | |
3614 | |
3615 /* Time to check for invisible text? */ | |
3616 if (IT_STRING_CHARPOS (*it) < it->end_charpos | |
3617 && IT_STRING_CHARPOS (*it) == it->stop_charpos) | |
3618 { | |
3619 handle_stop (it); | |
3620 | |
3621 /* Since a handler may have changed IT->method, we must | |
3622 recurse here. */ | |
3623 return get_next_display_element (it); | |
3624 } | |
3625 | |
3626 if (it->current.overlay_string_index >= 0) | |
3627 { | |
3628 /* Get the next character from an overlay string. In overlay | |
3629 strings, There is no field width or padding with spaces to | |
3630 do. */ | |
3631 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size) | |
3632 { | |
3633 it->what = IT_EOB; | |
3634 return 0; | |
3635 } | |
3636 else if (STRING_MULTIBYTE (it->string)) | |
3637 { | |
3638 int remaining = (STRING_BYTES (XSTRING (it->string)) | |
3639 - IT_STRING_BYTEPOS (*it)); | |
3640 unsigned char *s = (XSTRING (it->string)->data | |
3641 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3642 it->c = string_char_and_length (s, remaining, &it->len); |
25012 | 3643 } |
3644 else | |
3645 { | |
3646 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3647 it->len = 1; | |
3648 } | |
3649 } | |
3650 else | |
3651 { | |
3652 /* Get the next character from a Lisp string that is not an | |
3653 overlay string. Such strings come from the mode line, for | |
3654 example. We may have to pad with spaces, or truncate the | |
3655 string. See also next_element_from_c_string. */ | |
3656 if (IT_STRING_CHARPOS (*it) >= it->end_charpos) | |
3657 { | |
3658 it->what = IT_EOB; | |
3659 return 0; | |
3660 } | |
3661 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars) | |
3662 { | |
3663 /* Pad with spaces. */ | |
3664 it->c = ' ', it->len = 1; | |
3665 CHARPOS (position) = BYTEPOS (position) = -1; | |
3666 } | |
3667 else if (STRING_MULTIBYTE (it->string)) | |
3668 { | |
3669 int maxlen = (STRING_BYTES (XSTRING (it->string)) | |
3670 - IT_STRING_BYTEPOS (*it)); | |
3671 unsigned char *s = (XSTRING (it->string)->data | |
3672 + IT_STRING_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3673 it->c = string_char_and_length (s, maxlen, &it->len); |
25012 | 3674 } |
3675 else | |
3676 { | |
3677 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)]; | |
3678 it->len = 1; | |
3679 } | |
3680 } | |
3681 | |
3682 /* Record what we have and where it came from. Note that we store a | |
3683 buffer position in IT->position although it could arguably be a | |
3684 string position. */ | |
3685 it->what = IT_CHARACTER; | |
3686 it->object = it->string; | |
3687 it->position = position; | |
3688 return 1; | |
3689 } | |
3690 | |
3691 | |
3692 /* Load IT with next display element from C string IT->s. | |
3693 IT->string_nchars is the maximum number of characters to return | |
3694 from the string. IT->end_charpos may be greater than | |
3695 IT->string_nchars when this function is called, in which case we | |
3696 may have to return padding spaces. Value is zero if end of string | |
3697 reached, including padding spaces. */ | |
3698 | |
3699 static int | |
3700 next_element_from_c_string (it) | |
3701 struct it *it; | |
3702 { | |
3703 int success_p = 1; | |
3704 | |
3705 xassert (it->s); | |
3706 it->what = IT_CHARACTER; | |
3707 BYTEPOS (it->position) = CHARPOS (it->position) = 0; | |
3708 it->object = Qnil; | |
3709 | |
3710 /* IT's position can be greater IT->string_nchars in case a field | |
3711 width or precision has been specified when the iterator was | |
3712 initialized. */ | |
3713 if (IT_CHARPOS (*it) >= it->end_charpos) | |
3714 { | |
3715 /* End of the game. */ | |
3716 it->what = IT_EOB; | |
3717 success_p = 0; | |
3718 } | |
3719 else if (IT_CHARPOS (*it) >= it->string_nchars) | |
3720 { | |
3721 /* Pad with spaces. */ | |
3722 it->c = ' ', it->len = 1; | |
3723 BYTEPOS (it->position) = CHARPOS (it->position) = -1; | |
3724 } | |
3725 else if (it->multibyte_p) | |
3726 { | |
3727 /* Implementation note: The calls to strlen apparently aren't a | |
3728 performance problem because there is no noticeable performance | |
3729 difference between Emacs running in unibyte or multibyte mode. */ | |
3730 int maxlen = strlen (it->s) - IT_BYTEPOS (*it); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3731 it->c = string_char_and_length (it->s + IT_BYTEPOS (*it), |
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3732 maxlen, &it->len); |
25012 | 3733 } |
3734 else | |
3735 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1; | |
3736 | |
3737 return success_p; | |
3738 } | |
3739 | |
3740 | |
3741 /* Set up IT to return characters from an ellipsis, if appropriate. | |
3742 The definition of the ellipsis glyphs may come from a display table | |
3743 entry. This function Fills IT with the first glyph from the | |
3744 ellipsis if an ellipsis is to be displayed. */ | |
3745 | |
3746 static void | |
3747 next_element_from_ellipsis (it) | |
3748 struct it *it; | |
3749 { | |
3750 if (it->dp && VECTORP (DISP_INVIS_VECTOR (it->dp))) | |
3751 { | |
3752 /* Use the display table definition for `...'. Invalid glyphs | |
3753 will be handled by the method returning elements from dpvec. */ | |
3754 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp)); | |
3755 it->dpvec_char_len = it->len; | |
3756 it->dpvec = v->contents; | |
3757 it->dpend = v->contents + v->size; | |
3758 it->current.dpvec_index = 0; | |
3759 it->method = next_element_from_display_vector; | |
3760 get_next_display_element (it); | |
3761 } | |
3762 else if (it->selective_display_ellipsis_p) | |
3763 { | |
3764 /* Use default `...' which is stored in default_invis_vector. */ | |
3765 it->dpvec_char_len = it->len; | |
3766 it->dpvec = default_invis_vector; | |
3767 it->dpend = default_invis_vector + 3; | |
3768 it->current.dpvec_index = 0; | |
3769 it->method = next_element_from_display_vector; | |
3770 get_next_display_element (it); | |
3771 } | |
3772 } | |
3773 | |
3774 | |
3775 /* Deliver an image display element. The iterator IT is already | |
3776 filled with image information (done in handle_display_prop). Value | |
3777 is always 1. */ | |
3778 | |
3779 | |
3780 static int | |
3781 next_element_from_image (it) | |
3782 struct it *it; | |
3783 { | |
3784 it->what = IT_IMAGE; | |
3785 return 1; | |
3786 } | |
3787 | |
3788 | |
3789 /* Fill iterator IT with next display element from a stretch glyph | |
3790 property. IT->object is the value of the text property. Value is | |
3791 always 1. */ | |
3792 | |
3793 static int | |
3794 next_element_from_stretch (it) | |
3795 struct it *it; | |
3796 { | |
3797 it->what = IT_STRETCH; | |
3798 return 1; | |
3799 } | |
3800 | |
3801 | |
3802 /* Load IT with the next display element from current_buffer. Value | |
3803 is zero if end of buffer reached. IT->stop_charpos is the next | |
3804 position at which to stop and check for text properties or buffer | |
3805 end. */ | |
3806 | |
3807 static int | |
3808 next_element_from_buffer (it) | |
3809 struct it *it; | |
3810 { | |
3811 int success_p = 1; | |
3812 | |
3813 /* Check this assumption, otherwise, we would never enter the | |
3814 if-statement, below. */ | |
3815 xassert (IT_CHARPOS (*it) >= BEGV | |
3816 && IT_CHARPOS (*it) <= it->stop_charpos); | |
3817 | |
3818 if (IT_CHARPOS (*it) >= it->stop_charpos) | |
3819 { | |
3820 if (IT_CHARPOS (*it) >= it->end_charpos) | |
3821 { | |
3822 int overlay_strings_follow_p; | |
3823 | |
3824 /* End of the game, except when overlay strings follow that | |
3825 haven't been returned yet. */ | |
3826 if (it->overlay_strings_at_end_processed_p) | |
3827 overlay_strings_follow_p = 0; | |
3828 else | |
3829 { | |
3830 it->overlay_strings_at_end_processed_p = 1; | |
3831 overlay_strings_follow_p | |
3832 = get_overlay_strings (it); | |
3833 } | |
3834 | |
3835 if (overlay_strings_follow_p) | |
3836 success_p = get_next_display_element (it); | |
3837 else | |
3838 { | |
3839 it->what = IT_EOB; | |
3840 it->position = it->current.pos; | |
3841 success_p = 0; | |
3842 } | |
3843 } | |
3844 else | |
3845 { | |
3846 handle_stop (it); | |
3847 return get_next_display_element (it); | |
3848 } | |
3849 } | |
3850 else | |
3851 { | |
3852 /* No face changes, overlays etc. in sight, so just return a | |
3853 character from current_buffer. */ | |
3854 unsigned char *p; | |
3855 | |
3856 /* Maybe run the redisplay end trigger hook. Performance note: | |
3857 This doesn't seem to cost measurable time. */ | |
3858 if (it->redisplay_end_trigger_charpos | |
3859 && it->glyph_row | |
3860 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) | |
3861 run_redisplay_end_trigger_hook (it); | |
3862 | |
3863 /* Get the next character, maybe multibyte. */ | |
3864 p = BYTE_POS_ADDR (IT_BYTEPOS (*it)); | |
3865 if (it->multibyte_p) | |
3866 { | |
3867 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) | |
3868 - IT_BYTEPOS (*it)); | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
3869 it->c = string_char_and_length (p, maxlen, &it->len); |
25012 | 3870 } |
3871 else | |
3872 it->c = *p, it->len = 1; | |
3873 | |
3874 /* Record what we have and where it came from. */ | |
3875 it->what = IT_CHARACTER;; | |
3876 it->object = it->w->buffer; | |
3877 it->position = it->current.pos; | |
3878 | |
3879 /* Normally we return the character found above, except when we | |
3880 really want to return an ellipsis for selective display. */ | |
3881 if (it->selective) | |
3882 { | |
3883 if (it->c == '\n') | |
3884 { | |
3885 /* A value of selective > 0 means hide lines indented more | |
3886 than that number of columns. */ | |
3887 if (it->selective > 0 | |
3888 && IT_CHARPOS (*it) + 1 < ZV | |
3889 && indented_beyond_p (IT_CHARPOS (*it) + 1, | |
3890 IT_BYTEPOS (*it) + 1, | |
3891 it->selective)) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3892 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3893 next_element_from_ellipsis (it); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3894 it->dpvec_char_len = -1; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3895 } |
25012 | 3896 } |
3897 else if (it->c == '\r' && it->selective == -1) | |
3898 { | |
3899 /* A value of selective == -1 means that everything from the | |
3900 CR to the end of the line is invisible, with maybe an | |
3901 ellipsis displayed for it. */ | |
3902 next_element_from_ellipsis (it); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
3903 it->dpvec_char_len = -1; |
25012 | 3904 } |
3905 } | |
3906 } | |
3907 | |
3908 /* Value is zero if end of buffer reached. */ | |
3909 xassert (!success_p || it->len > 0); | |
3910 return success_p; | |
3911 } | |
3912 | |
3913 | |
3914 /* Run the redisplay end trigger hook for IT. */ | |
3915 | |
3916 static void | |
3917 run_redisplay_end_trigger_hook (it) | |
3918 struct it *it; | |
3919 { | |
3920 Lisp_Object args[3]; | |
3921 | |
3922 /* IT->glyph_row should be non-null, i.e. we should be actually | |
3923 displaying something, or otherwise we should not run the hook. */ | |
3924 xassert (it->glyph_row); | |
3925 | |
3926 /* Set up hook arguments. */ | |
3927 args[0] = Qredisplay_end_trigger_functions; | |
3928 args[1] = it->window; | |
3929 XSETINT (args[2], it->redisplay_end_trigger_charpos); | |
3930 it->redisplay_end_trigger_charpos = 0; | |
3931 | |
3932 /* Since we are *trying* to run these functions, don't try to run | |
3933 them again, even if they get an error. */ | |
3934 it->w->redisplay_end_trigger = Qnil; | |
3935 Frun_hook_with_args (3, args); | |
3936 | |
3937 /* Notice if it changed the face of the character we are on. */ | |
3938 handle_face_prop (it); | |
3939 } | |
3940 | |
3941 | |
3942 | |
3943 /*********************************************************************** | |
3944 Moving an iterator without producing glyphs | |
3945 ***********************************************************************/ | |
3946 | |
3947 /* Move iterator IT to a specified buffer or X position within one | |
3948 line on the display without producing glyphs. | |
3949 | |
3950 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X | |
3951 whichever is reached first. | |
3952 | |
3953 TO_CHARPOS <= 0 means no TO_CHARPOS is specified. | |
3954 | |
3955 TO_X < 0 means that no TO_X is specified. TO_X is normally a value | |
3956 0 <= TO_X <= IT->last_visible_x. This means in particular, that | |
3957 TO_X includes the amount by which a window is horizontally | |
3958 scrolled. | |
3959 | |
3960 Value is | |
3961 | |
3962 MOVE_POS_MATCH_OR_ZV | |
3963 - when TO_POS or ZV was reached. | |
3964 | |
3965 MOVE_X_REACHED | |
3966 -when TO_X was reached before TO_POS or ZV were reached. | |
3967 | |
3968 MOVE_LINE_CONTINUED | |
3969 - when we reached the end of the display area and the line must | |
3970 be continued. | |
3971 | |
3972 MOVE_LINE_TRUNCATED | |
3973 - when we reached the end of the display area and the line is | |
3974 truncated. | |
3975 | |
3976 MOVE_NEWLINE_OR_CR | |
3977 - when we stopped at a line end, i.e. a newline or a CR and selective | |
3978 display is on. */ | |
3979 | |
25693
b12ed057020a
(move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents:
25677
diff
changeset
|
3980 static enum move_it_result |
25012 | 3981 move_it_in_display_line_to (it, to_charpos, to_x, op) |
3982 struct it *it; | |
3983 int to_charpos, to_x, op; | |
3984 { | |
3985 enum move_it_result result = MOVE_UNDEFINED; | |
3986 struct glyph_row *saved_glyph_row; | |
3987 | |
3988 /* Don't produce glyphs in produce_glyphs. */ | |
3989 saved_glyph_row = it->glyph_row; | |
3990 it->glyph_row = NULL; | |
3991 | |
3992 while (1) | |
3993 { | |
3994 int x, i; | |
3995 | |
3996 /* Stop when ZV or TO_CHARPOS reached. */ | |
3997 if (!get_next_display_element (it) | |
3998 || ((op & MOVE_TO_POS) != 0 | |
3999 && BUFFERP (it->object) | |
4000 && IT_CHARPOS (*it) >= to_charpos)) | |
4001 { | |
4002 result = MOVE_POS_MATCH_OR_ZV; | |
4003 break; | |
4004 } | |
4005 | |
4006 /* The call to produce_glyphs will get the metrics of the | |
4007 display element IT is loaded with. We record in x the | |
4008 x-position before this display element in case it does not | |
4009 fit on the line. */ | |
4010 x = it->current_x; | |
4011 PRODUCE_GLYPHS (it); | |
4012 | |
4013 if (it->area != TEXT_AREA) | |
4014 { | |
4015 set_iterator_to_next (it); | |
4016 continue; | |
4017 } | |
4018 | |
4019 /* The number of glyphs we get back in IT->nglyphs will normally | |
4020 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph | |
4021 character on a terminal frame, or (iii) a line end. For the | |
4022 second case, IT->nglyphs - 1 padding glyphs will be present | |
4023 (on X frames, there is only one glyph produced for a | |
4024 composite character. | |
4025 | |
4026 The behavior implemented below means, for continuation lines, | |
4027 that as many spaces of a TAB as fit on the current line are | |
4028 displayed there. For terminal frames, as many glyphs of a | |
4029 multi-glyph character are displayed in the current line, too. | |
4030 This is what the old redisplay code did, and we keep it that | |
4031 way. Under X, the whole shape of a complex character must | |
4032 fit on the line or it will be completely displayed in the | |
4033 next line. | |
4034 | |
4035 Note that both for tabs and padding glyphs, all glyphs have | |
4036 the same width. */ | |
4037 if (it->nglyphs) | |
4038 { | |
4039 /* More than one glyph or glyph doesn't fit on line. All | |
4040 glyphs have the same width. */ | |
4041 int single_glyph_width = it->pixel_width / it->nglyphs; | |
4042 int new_x; | |
4043 | |
4044 for (i = 0; i < it->nglyphs; ++i, x = new_x) | |
4045 { | |
4046 new_x = x + single_glyph_width; | |
4047 | |
4048 /* We want to leave anything reaching TO_X to the caller. */ | |
4049 if ((op & MOVE_TO_X) && new_x > to_x) | |
4050 { | |
4051 it->current_x = x; | |
4052 result = MOVE_X_REACHED; | |
4053 break; | |
4054 } | |
4055 else if (/* Lines are continued. */ | |
4056 !it->truncate_lines_p | |
4057 && (/* And glyph doesn't fit on the line. */ | |
4058 new_x > it->last_visible_x | |
4059 /* Or it fits exactly and we're on a window | |
4060 system frame. */ | |
4061 || (new_x == it->last_visible_x | |
4062 && FRAME_WINDOW_P (it->f)))) | |
4063 { | |
4064 if (/* IT->hpos == 0 means the very first glyph | |
4065 doesn't fit on the line, e.g. a wide image. */ | |
4066 it->hpos == 0 | |
4067 || (new_x == it->last_visible_x | |
4068 && FRAME_WINDOW_P (it->f))) | |
4069 { | |
4070 ++it->hpos; | |
4071 it->current_x = new_x; | |
4072 if (i == it->nglyphs - 1) | |
4073 set_iterator_to_next (it); | |
4074 } | |
4075 else | |
4076 it->current_x = x; | |
4077 | |
4078 result = MOVE_LINE_CONTINUED; | |
4079 break; | |
4080 } | |
4081 else if (new_x > it->first_visible_x) | |
4082 { | |
4083 /* Glyph is visible. Increment number of glyphs that | |
4084 would be displayed. */ | |
4085 ++it->hpos; | |
4086 } | |
4087 else | |
4088 { | |
4089 /* Glyph is completely off the left margin of the display | |
4090 area. Nothing to do. */ | |
4091 } | |
4092 } | |
4093 | |
4094 if (result != MOVE_UNDEFINED) | |
4095 break; | |
4096 } | |
4097 else if ((op & MOVE_TO_X) && it->current_x >= to_x) | |
4098 { | |
4099 /* Stop when TO_X specified and reached. This check is | |
4100 necessary here because of lines consisting of a line end, | |
4101 only. The line end will not produce any glyphs and we | |
4102 would never get MOVE_X_REACHED. */ | |
4103 xassert (it->nglyphs == 0); | |
4104 result = MOVE_X_REACHED; | |
4105 break; | |
4106 } | |
4107 | |
4108 /* Is this a line end? If yes, we're done. */ | |
4109 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
4110 { | |
4111 result = MOVE_NEWLINE_OR_CR; | |
4112 break; | |
4113 } | |
4114 | |
4115 /* The current display element has been consumed. Advance | |
4116 to the next. */ | |
4117 set_iterator_to_next (it); | |
4118 | |
4119 /* Stop if lines are truncated and IT's current x-position is | |
4120 past the right edge of the window now. */ | |
4121 if (it->truncate_lines_p | |
4122 && it->current_x >= it->last_visible_x) | |
4123 { | |
4124 result = MOVE_LINE_TRUNCATED; | |
4125 break; | |
4126 } | |
4127 } | |
4128 | |
4129 /* Restore the iterator settings altered at the beginning of this | |
4130 function. */ | |
4131 it->glyph_row = saved_glyph_row; | |
4132 return result; | |
4133 } | |
4134 | |
4135 | |
4136 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X, | |
4137 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See | |
4138 the description of enum move_operation_enum. | |
4139 | |
4140 If TO_CHARPOS is in invisible text, e.g. a truncated part of a | |
4141 screen line, this function will set IT to the next position > | |
4142 TO_CHARPOS. */ | |
4143 | |
4144 void | |
4145 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op) | |
4146 struct it *it; | |
4147 int to_charpos, to_x, to_y, to_vpos; | |
4148 int op; | |
4149 { | |
4150 enum move_it_result skip, skip2 = MOVE_X_REACHED; | |
4151 int line_height; | |
4152 | |
4153 while (1) | |
4154 { | |
4155 if (op & MOVE_TO_VPOS) | |
4156 { | |
4157 /* If no TO_CHARPOS and no TO_X specified, stop at the | |
4158 start of the line TO_VPOS. */ | |
4159 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0) | |
4160 { | |
4161 if (it->vpos == to_vpos) | |
4162 break; | |
4163 skip = move_it_in_display_line_to (it, -1, -1, 0); | |
4164 } | |
4165 else | |
4166 { | |
4167 /* TO_VPOS >= 0 means stop at TO_X in the line at | |
4168 TO_VPOS, or at TO_POS, whichever comes first. */ | |
4169 skip = move_it_in_display_line_to (it, to_charpos, to_x, op); | |
4170 | |
4171 if (skip == MOVE_POS_MATCH_OR_ZV || it->vpos == to_vpos) | |
4172 break; | |
4173 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos) | |
4174 { | |
4175 /* We have reached TO_X but not in the line we want. */ | |
4176 skip = move_it_in_display_line_to (it, to_charpos, | |
4177 -1, MOVE_TO_POS); | |
4178 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4179 break; | |
4180 } | |
4181 } | |
4182 } | |
4183 else if (op & MOVE_TO_Y) | |
4184 { | |
4185 struct it it_backup; | |
4186 int done_p; | |
4187 | |
4188 /* TO_Y specified means stop at TO_X in the line containing | |
4189 TO_Y---or at TO_CHARPOS if this is reached first. The | |
4190 problem is that we can't really tell whether the line | |
4191 contains TO_Y before we have completely scanned it, and | |
4192 this may skip past TO_X. What we do is to first scan to | |
4193 TO_X. | |
4194 | |
4195 If TO_X is not specified, use a TO_X of zero. The reason | |
4196 is to make the outcome of this function more predictable. | |
4197 If we didn't use TO_X == 0, we would stop at the end of | |
4198 the line which is probably not what a caller would expect | |
4199 to happen. */ | |
4200 skip = move_it_in_display_line_to (it, to_charpos, | |
4201 ((op & MOVE_TO_X) | |
4202 ? to_x : 0), | |
4203 (MOVE_TO_X | |
4204 | (op & MOVE_TO_POS))); | |
4205 | |
4206 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */ | |
4207 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4208 break; | |
4209 | |
4210 /* If TO_X was reached, we would like to know whether TO_Y | |
4211 is in the line. This can only be said if we know the | |
4212 total line height which requires us to scan the rest of | |
4213 the line. */ | |
4214 done_p = 0; | |
4215 if (skip == MOVE_X_REACHED) | |
4216 { | |
4217 it_backup = *it; | |
4218 skip2 = move_it_in_display_line_to (it, to_charpos, -1, | |
4219 op & MOVE_TO_POS); | |
4220 } | |
4221 | |
4222 /* Now, decide whether TO_Y is in this line. */ | |
4223 line_height = it->max_ascent + it->max_descent; | |
4224 | |
4225 if (to_y >= it->current_y | |
4226 && to_y < it->current_y + line_height) | |
4227 { | |
4228 if (skip == MOVE_X_REACHED) | |
4229 /* If TO_Y is in this line and TO_X was reached above, | |
4230 we scanned too far. We have to restore IT's settings | |
4231 to the ones before skipping. */ | |
4232 *it = it_backup; | |
4233 done_p = 1; | |
4234 } | |
4235 else if (skip == MOVE_X_REACHED) | |
4236 { | |
4237 skip = skip2; | |
4238 if (skip == MOVE_POS_MATCH_OR_ZV) | |
4239 done_p = 1; | |
4240 } | |
4241 | |
4242 if (done_p) | |
4243 break; | |
4244 } | |
4245 else | |
4246 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS); | |
4247 | |
4248 switch (skip) | |
4249 { | |
4250 case MOVE_POS_MATCH_OR_ZV: | |
4251 return; | |
4252 | |
4253 case MOVE_NEWLINE_OR_CR: | |
4254 set_iterator_to_next (it); | |
4255 it->continuation_lines_width = 0; | |
4256 break; | |
4257 | |
4258 case MOVE_LINE_TRUNCATED: | |
4259 it->continuation_lines_width = 0; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
4260 reseat_at_next_visible_line_start (it, 0); |
25012 | 4261 if ((op & MOVE_TO_POS) != 0 |
4262 && IT_CHARPOS (*it) > to_charpos) | |
4263 goto out; | |
4264 break; | |
4265 | |
4266 case MOVE_LINE_CONTINUED: | |
4267 it->continuation_lines_width += it->current_x; | |
4268 break; | |
4269 | |
4270 default: | |
4271 abort (); | |
4272 } | |
4273 | |
4274 /* Reset/increment for the next run. */ | |
4275 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); | |
4276 it->current_x = it->hpos = 0; | |
4277 it->current_y += it->max_ascent + it->max_descent; | |
4278 ++it->vpos; | |
4279 last_height = it->max_ascent + it->max_descent; | |
4280 last_max_ascent = it->max_ascent; | |
4281 it->max_ascent = it->max_descent = 0; | |
4282 } | |
4283 out:; | |
4284 } | |
4285 | |
4286 | |
4287 /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | |
4288 | |
4289 If DY > 0, move IT backward at least that many pixels. DY = 0 | |
4290 means move IT backward to the preceding line start or BEGV. This | |
4291 function may move over more than DY pixels if IT->current_y - DY | |
4292 ends up in the middle of a line; in this case IT->current_y will be | |
4293 set to the top of the line moved to. */ | |
4294 | |
4295 void | |
4296 move_it_vertically_backward (it, dy) | |
4297 struct it *it; | |
4298 int dy; | |
4299 { | |
4300 int nlines, h, line_height; | |
4301 struct it it2; | |
4302 int start_pos = IT_CHARPOS (*it); | |
4303 | |
4304 xassert (dy >= 0); | |
4305 | |
4306 /* Estimate how many newlines we must move back. */ | |
4307 nlines = max (1, dy / CANON_Y_UNIT (it->f)); | |
4308 | |
4309 /* Set the iterator's position that many lines back. */ | |
4310 while (nlines-- && IT_CHARPOS (*it) > BEGV) | |
4311 back_to_previous_visible_line_start (it); | |
4312 | |
4313 /* Reseat the iterator here. When moving backward, we don't want | |
4314 reseat to skip forward over invisible text, set up the iterator | |
4315 to deliver from overlay strings at the new position etc. So, | |
4316 use reseat_1 here. */ | |
4317 reseat_1 (it, it->current.pos, 1); | |
4318 | |
4319 /* We are now surely at a line start. */ | |
4320 it->current_x = it->hpos = 0; | |
4321 | |
4322 /* Move forward and see what y-distance we moved. First move to the | |
4323 start of the next line so that we get its height. We need this | |
4324 height to be able to tell whether we reached the specified | |
4325 y-distance. */ | |
4326 it2 = *it; | |
4327 it2.max_ascent = it2.max_descent = 0; | |
4328 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1, | |
4329 MOVE_TO_POS | MOVE_TO_VPOS); | |
4330 xassert (IT_CHARPOS (*it) >= BEGV); | |
4331 line_height = it2.max_ascent + it2.max_descent; | |
4332 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS); | |
4333 xassert (IT_CHARPOS (*it) >= BEGV); | |
4334 h = it2.current_y - it->current_y; | |
4335 nlines = it2.vpos - it->vpos; | |
4336 | |
4337 /* Correct IT's y and vpos position. */ | |
4338 it->vpos -= nlines; | |
4339 it->current_y -= h; | |
4340 | |
4341 if (dy == 0) | |
4342 { | |
4343 /* DY == 0 means move to the start of the screen line. The | |
4344 value of nlines is > 0 if continuation lines were involved. */ | |
4345 if (nlines > 0) | |
4346 move_it_by_lines (it, nlines, 1); | |
4347 xassert (IT_CHARPOS (*it) <= start_pos); | |
4348 } | |
4349 else if (nlines) | |
4350 { | |
4351 /* The y-position we try to reach. Note that h has been | |
4352 subtracted in front of the if-statement. */ | |
4353 int target_y = it->current_y + h - dy; | |
4354 | |
4355 /* If we did not reach target_y, try to move further backward if | |
4356 we can. If we moved too far backward, try to move forward. */ | |
4357 if (target_y < it->current_y | |
4358 && IT_CHARPOS (*it) > BEGV) | |
4359 { | |
4360 move_it_vertically (it, target_y - it->current_y); | |
4361 xassert (IT_CHARPOS (*it) >= BEGV); | |
4362 } | |
4363 else if (target_y >= it->current_y + line_height | |
4364 && IT_CHARPOS (*it) < ZV) | |
4365 { | |
4366 move_it_vertically (it, target_y - (it->current_y + line_height)); | |
4367 xassert (IT_CHARPOS (*it) >= BEGV); | |
4368 } | |
4369 } | |
4370 } | |
4371 | |
4372 | |
4373 /* Move IT by a specified amount of pixel lines DY. DY negative means | |
4374 move backwards. DY = 0 means move to start of screen line. At the | |
4375 end, IT will be on the start of a screen line. */ | |
4376 | |
4377 void | |
4378 move_it_vertically (it, dy) | |
4379 struct it *it; | |
4380 int dy; | |
4381 { | |
4382 if (dy <= 0) | |
4383 move_it_vertically_backward (it, -dy); | |
4384 else if (dy > 0) | |
4385 { | |
4386 move_it_to (it, ZV, -1, it->current_y + dy, -1, | |
4387 MOVE_TO_POS | MOVE_TO_Y); | |
4388 | |
4389 /* If buffer ends in ZV without a newline, move to the start of | |
4390 the line to satisfy the post-condition. */ | |
4391 if (IT_CHARPOS (*it) == ZV | |
4392 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') | |
4393 move_it_by_lines (it, 0, 0); | |
4394 } | |
4395 } | |
4396 | |
4397 | |
4398 /* Return non-zero if some text between buffer positions START_CHARPOS | |
4399 and END_CHARPOS is invisible. IT->window is the window for text | |
4400 property lookup. */ | |
4401 | |
4402 static int | |
4403 invisible_text_between_p (it, start_charpos, end_charpos) | |
4404 struct it *it; | |
4405 int start_charpos, end_charpos; | |
4406 { | |
4407 #ifdef USE_TEXT_PROPERTIES | |
4408 Lisp_Object prop, limit; | |
4409 int invisible_found_p; | |
4410 | |
4411 xassert (it != NULL && start_charpos <= end_charpos); | |
4412 | |
4413 /* Is text at START invisible? */ | |
4414 prop = Fget_char_property (make_number (start_charpos), Qinvisible, | |
4415 it->window); | |
4416 if (TEXT_PROP_MEANS_INVISIBLE (prop)) | |
4417 invisible_found_p = 1; | |
4418 else | |
4419 { | |
25820
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
4420 limit = next_single_char_property_change (make_number (start_charpos), |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
4421 Qinvisible, Qnil, |
a18595261196
(display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25798
diff
changeset
|
4422 make_number (end_charpos)); |
25012 | 4423 invisible_found_p = XFASTINT (limit) < end_charpos; |
4424 } | |
4425 | |
4426 return invisible_found_p; | |
4427 | |
4428 #else /* not USE_TEXT_PROPERTIES */ | |
4429 return 0; | |
4430 #endif /* not USE_TEXT_PROPERTIES */ | |
4431 } | |
4432 | |
4433 | |
4434 /* Move IT by a specified number DVPOS of screen lines down. DVPOS | |
4435 negative means move up. DVPOS == 0 means move to the start of the | |
4436 screen line. NEED_Y_P non-zero means calculate IT->current_y. If | |
4437 NEED_Y_P is zero, IT->current_y will be left unchanged. | |
4438 | |
4439 Further optimization ideas: If we would know that IT->f doesn't use | |
4440 a face with proportional font, we could be faster for | |
4441 truncate-lines nil. */ | |
4442 | |
4443 void | |
4444 move_it_by_lines (it, dvpos, need_y_p) | |
4445 struct it *it; | |
4446 int dvpos, need_y_p; | |
4447 { | |
4448 struct position pos; | |
4449 | |
4450 if (!FRAME_WINDOW_P (it->f)) | |
4451 { | |
4452 struct text_pos textpos; | |
4453 | |
4454 /* We can use vmotion on frames without proportional fonts. */ | |
4455 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w); | |
4456 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos); | |
4457 reseat (it, textpos, 1); | |
4458 it->vpos += pos.vpos; | |
4459 it->current_y += pos.vpos; | |
4460 } | |
4461 else if (dvpos == 0) | |
4462 { | |
4463 /* DVPOS == 0 means move to the start of the screen line. */ | |
4464 move_it_vertically_backward (it, 0); | |
4465 xassert (it->current_x == 0 && it->hpos == 0); | |
4466 } | |
4467 else if (dvpos > 0) | |
4468 { | |
4469 /* If there are no continuation lines, and if there is no | |
4470 selective display, try the simple method of moving forward | |
4471 DVPOS newlines, then see where we are. */ | |
4472 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4473 { | |
4474 int shortage = 0, charpos; | |
4475 | |
4476 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n')) | |
4477 charpos = IT_CHARPOS (*it) + 1; | |
4478 else | |
4479 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos, | |
4480 &shortage, 0); | |
4481 | |
4482 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos)) | |
4483 { | |
4484 struct text_pos pos; | |
4485 CHARPOS (pos) = charpos; | |
4486 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4487 reseat (it, pos, 1); | |
4488 it->vpos += dvpos - shortage; | |
4489 it->hpos = it->current_x = 0; | |
4490 return; | |
4491 } | |
4492 } | |
4493 | |
4494 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS); | |
4495 } | |
4496 else | |
4497 { | |
4498 struct it it2; | |
4499 int start_charpos, i; | |
4500 | |
4501 /* If there are no continuation lines, and if there is no | |
4502 selective display, try the simple method of moving backward | |
4503 -DVPOS newlines. */ | |
4504 if (!need_y_p && it->truncate_lines_p && it->selective == 0) | |
4505 { | |
4506 int shortage; | |
4507 int charpos = IT_CHARPOS (*it); | |
4508 int bytepos = IT_BYTEPOS (*it); | |
4509 | |
4510 /* If in the middle of a line, go to its start. */ | |
4511 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n') | |
4512 { | |
4513 charpos = find_next_newline_no_quit (charpos, -1); | |
4514 bytepos = CHAR_TO_BYTE (charpos); | |
4515 } | |
4516 | |
4517 if (charpos == BEGV) | |
4518 { | |
4519 struct text_pos pos; | |
4520 CHARPOS (pos) = charpos; | |
4521 BYTEPOS (pos) = bytepos; | |
4522 reseat (it, pos, 1); | |
4523 it->hpos = it->current_x = 0; | |
4524 return; | |
4525 } | |
4526 else | |
4527 { | |
4528 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0); | |
4529 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it))) | |
4530 { | |
4531 struct text_pos pos; | |
4532 CHARPOS (pos) = charpos; | |
4533 BYTEPOS (pos) = CHAR_TO_BYTE (charpos); | |
4534 reseat (it, pos, 1); | |
4535 it->vpos += dvpos + (shortage ? shortage - 1 : 0); | |
4536 it->hpos = it->current_x = 0; | |
4537 return; | |
4538 } | |
4539 } | |
4540 } | |
4541 | |
4542 /* Go back -DVPOS visible lines and reseat the iterator there. */ | |
4543 start_charpos = IT_CHARPOS (*it); | |
4544 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i) | |
4545 back_to_previous_visible_line_start (it); | |
4546 reseat (it, it->current.pos, 1); | |
4547 it->current_x = it->hpos = 0; | |
4548 | |
4549 /* Above call may have moved too far if continuation lines | |
4550 are involved. Scan forward and see if it did. */ | |
4551 it2 = *it; | |
4552 it2.vpos = it2.current_y = 0; | |
4553 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS); | |
4554 it->vpos -= it2.vpos; | |
4555 it->current_y -= it2.current_y; | |
4556 it->current_x = it->hpos = 0; | |
4557 | |
4558 /* If we moved too far, move IT some lines forward. */ | |
4559 if (it2.vpos > -dvpos) | |
4560 { | |
4561 int delta = it2.vpos + dvpos; | |
4562 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS); | |
4563 } | |
4564 } | |
4565 } | |
4566 | |
4567 | |
4568 | |
4569 /*********************************************************************** | |
4570 Messages | |
4571 ***********************************************************************/ | |
4572 | |
4573 | |
25798
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4574 /* Add a message with format string FORMAT and arguments ARG1 and ARG2 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4575 to *Messages*. */ |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4576 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4577 void |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4578 add_to_log (format, arg1, arg2) |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4579 char *format; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4580 Lisp_Object arg1, arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4581 { |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4582 Lisp_Object args[3]; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4583 Lisp_Object msg, fmt; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4584 char *buffer; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4585 int len; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4586 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4587 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4588 fmt = msg = Qnil; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4589 GCPRO4 (fmt, msg, arg1, arg2); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4590 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4591 args[0] = fmt = build_string (format); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4592 args[1] = arg1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4593 args[2] = arg2; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4594 msg = Fformat (make_number (3), args); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4595 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4596 len = STRING_BYTES (XSTRING (msg)) + 1; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4597 buffer = (char *) alloca (len); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4598 strcpy (buffer, XSTRING (msg)->data); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4599 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4600 message_dolog (buffer, len, 1, 0); |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4601 UNGCPRO; |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4602 } |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4603 |
775d0eca0cc3
(add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents:
25794
diff
changeset
|
4604 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4605 /* Output a newline in the *Messages* buffer if "needs" one. */ |
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4606 |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4607 void |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4608 message_log_maybe_newline () |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4609 { |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4610 if (message_log_need_newline) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4611 message_dolog ("", 0, 1, 0); |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4612 } |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4613 |
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4614 |
25012 | 4615 /* Add a string M of length LEN to the message log, optionally |
4616 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if | |
4617 nonzero, means interpret the contents of M as multibyte. This | |
4618 function calls low-level routines in order to bypass text property | |
4619 hooks, etc. which might not be safe to run. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4620 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4621 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4622 message_dolog (m, len, nlflag, multibyte) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4623 char *m; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4624 int len, nlflag, multibyte; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4625 { |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4626 if (!NILP (Vmessage_log_max)) |
10393 | 4627 { |
4628 struct buffer *oldbuf; | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4629 Lisp_Object oldpoint, oldbegv, oldzv; |
13733
e51b69e60614
(message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents:
13655
diff
changeset
|
4630 int old_windows_or_buffers_changed = windows_or_buffers_changed; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4631 int point_at_end = 0; |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4632 int zv_at_end = 0; |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4633 Lisp_Object old_deactivate_mark, tem; |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4634 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4635 |
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4636 old_deactivate_mark = Vdeactivate_mark; |
10393 | 4637 oldbuf = current_buffer; |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4638 Fset_buffer (Fget_buffer_create (build_string ("*Messages*"))); |
11531
355c40d2b1d2
(message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents:
11499
diff
changeset
|
4639 current_buffer->undo_list = Qt; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4640 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4641 oldpoint = Fpoint_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4642 oldbegv = Fpoint_min_marker (); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4643 oldzv = Fpoint_max_marker (); |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4644 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4645 |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4646 if (PT == Z) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4647 point_at_end = 1; |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4648 if (ZV == Z) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4649 zv_at_end = 1; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4650 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4651 BEGV = BEG; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4652 BEGV_BYTE = BEG_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4653 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4654 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4655 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4656 |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4657 /* Insert the string--maybe converting multibyte to single byte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4658 or vice versa, so that all the text fits the buffer. */ |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4659 if (multibyte |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4660 && NILP (current_buffer->enable_multibyte_characters)) |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4661 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4662 int i, c, nbytes; |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4663 unsigned char work[1]; |
25012 | 4664 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4665 /* Convert a multibyte string to single-byte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4666 for the *Message* buffer. */ |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4667 for (i = 0; i < len; i += nbytes) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4668 { |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
4669 c = string_char_and_length (m + i, len - i, &nbytes); |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4670 work[0] = (SINGLE_BYTE_CHAR_P (c) |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4671 ? c |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4672 : multibyte_char_to_unibyte (c, Qnil)); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4673 insert_1_both (work, 1, 1, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4674 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4675 } |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4676 else if (! multibyte |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4677 && ! NILP (current_buffer->enable_multibyte_characters)) |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4678 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4679 int i, c, nbytes; |
20786
49d68bf8f34b
(message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents:
20703
diff
changeset
|
4680 unsigned char *msg = (unsigned char *) m; |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4681 unsigned char *str, work[4]; |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4682 /* Convert a single-byte string to multibyte |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4683 for the *Message* buffer. */ |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4684 for (i = 0; i < len; i++) |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4685 { |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4686 c = unibyte_char_to_multibyte (msg[i]); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4687 nbytes = CHAR_STRING (c, work, str); |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4688 insert_1_both (work, 1, nbytes, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4689 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4690 } |
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4691 else if (len) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4692 insert_1 (m, len, 1, 0, 0); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4693 |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4694 if (nlflag) |
10393 | 4695 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4696 int this_bol, this_bol_byte, prev_bol, prev_bol_byte, dup; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4697 insert_1 ("\n", 1, 1, 0, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4698 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4699 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4700 this_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4701 this_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4702 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4703 if (this_bol > BEG) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4704 { |
20703
f465da76f36b
(message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
20689
diff
changeset
|
4705 scan_newline (PT, PT_BYTE, BEG, BEG_BYTE, -2, 0); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4706 prev_bol = PT; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4707 prev_bol_byte = PT_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4708 |
20964
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
4709 dup = message_log_check_duplicate (prev_bol, prev_bol_byte, |
4cad33afd914
(message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents:
20926
diff
changeset
|
4710 this_bol, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4711 if (dup) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4712 { |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4713 del_range_both (prev_bol, prev_bol_byte, |
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4714 this_bol, this_bol_byte, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4715 if (dup > 1) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4716 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4717 char dupstr[40]; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4718 int duplen; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4719 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4720 /* If you change this format, don't forget to also |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4721 change message_log_check_duplicate. */ |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4722 sprintf (dupstr, " [%d times]", dup); |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4723 duplen = strlen (dupstr); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4724 TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4725 insert_1 (dupstr, duplen, 1, 0, 1); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4726 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4727 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4728 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4729 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4730 if (NATNUMP (Vmessage_log_max)) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4731 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4732 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4733 -XFASTINT (Vmessage_log_max) - 1, 0); |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20964
diff
changeset
|
4734 del_range_both (BEG, BEG_BYTE, PT, PT_BYTE, 0); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4735 } |
10393 | 4736 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4737 BEGV = XMARKER (oldbegv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4738 BEGV_BYTE = marker_byte_position (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4739 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4740 if (zv_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4741 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4742 ZV = Z; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4743 ZV_BYTE = Z_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4744 } |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4745 else |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4746 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4747 ZV = XMARKER (oldzv)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4748 ZV_BYTE = marker_byte_position (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4749 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4750 |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4751 if (point_at_end) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4752 TEMP_SET_PT_BOTH (Z, Z_BYTE); |
20473
f8b70ad2fc2a
(message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents:
20376
diff
changeset
|
4753 else |
24040
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4754 /* We can't do Fgoto_char (oldpoint) because it will run some |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4755 Lisp code. */ |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4756 TEMP_SET_PT_BOTH (XMARKER (oldpoint)->charpos, |
d178122d6122
(message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents:
23784
diff
changeset
|
4757 XMARKER (oldpoint)->bytepos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4758 |
22500
274456e421ab
(message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents:
22399
diff
changeset
|
4759 UNGCPRO; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4760 free_marker (oldpoint); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4761 free_marker (oldbegv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4762 free_marker (oldzv); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4763 |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4764 tem = Fget_buffer_window (Fcurrent_buffer (), Qt); |
10393 | 4765 set_buffer_internal (oldbuf); |
22209
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4766 if (NILP (tem)) |
571020b7fc5e
(message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents:
22148
diff
changeset
|
4767 windows_or_buffers_changed = old_windows_or_buffers_changed; |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4768 message_log_need_newline = !nlflag; |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
4769 Vdeactivate_mark = old_deactivate_mark; |
10393 | 4770 } |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4771 } |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4772 |
25012 | 4773 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4774 /* We are at the end of the buffer after just having inserted a newline. |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4775 (Note: We depend on the fact we won't be crossing the gap.) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4776 Check to see if the most recent message looks a lot like the previous one. |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4777 Return 0 if different, 1 if the new one should just replace it, or a |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4778 value N > 1 if we should also append " [N times]". */ |
11444
763c454b044e
(redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents:
11354
diff
changeset
|
4779 |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4780 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4781 message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte) |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4782 int prev_bol, this_bol; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4783 int prev_bol_byte, this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4784 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4785 int i; |
23257
b72cefab3254
(message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents:
23249
diff
changeset
|
4786 int len = Z_BYTE - 1 - this_bol_byte; |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4787 int seen_dots = 0; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4788 unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
4789 unsigned char *p2 = BUF_BYTE_ADDRESS (current_buffer, this_bol_byte); |
10688
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4790 |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4791 for (i = 0; i < len; i++) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4792 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4793 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.' |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4794 && p1[i] != '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4795 seen_dots = 1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4796 if (p1[i] != p2[i]) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4797 return seen_dots; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4798 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4799 p1 += len; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4800 if (*p1 == '\n') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4801 return 2; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4802 if (*p1++ == ' ' && *p1++ == '[') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4803 { |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4804 int n = 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4805 while (*p1 >= '0' && *p1 <= '9') |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4806 n = n * 10 + *p1++ - '0'; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4807 if (strncmp (p1, " times]\n", 8) == 0) |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4808 return n+1; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4809 } |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4810 return 0; |
340ceb6ae024
(message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10667
diff
changeset
|
4811 } |
25012 | 4812 |
4813 | |
4814 /* Display an echo area message M with a specified length of LEN | |
4815 chars. The string may include null characters. If M is 0, clear | |
4816 out any existing message, and let the mini-buffer text show through. | |
4817 | |
4818 The buffer M must continue to exist until after the echo area gets | |
4819 cleared or some other message gets displayed there. This means do | |
4820 not pass text that is stored in a Lisp string; do not pass text in | |
4821 a buffer that was alloca'd. */ | |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4822 |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4823 void |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4824 message2 (m, len, multibyte) |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4825 char *m; |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4826 int len; |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4827 int multibyte; |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4828 { |
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4829 /* First flush out any partial line written with print. */ |
10567
65c5552c16cb
(message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents:
10457
diff
changeset
|
4830 message_log_maybe_newline (); |
10416
51c4308d74c9
(message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents:
10394
diff
changeset
|
4831 if (m) |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4832 message_dolog (m, len, 1, multibyte); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4833 message2_nolog (m, len, multibyte); |
10393 | 4834 } |
4835 | |
4836 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
4837 /* The non-logging counterpart of message2. */ |
10393 | 4838 |
4839 void | |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
4840 message2_nolog (m, len, multibyte) |
10393 | 4841 char *m; |
4842 int len; | |
4843 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4844 struct frame *sf = SELECTED_FRAME (); |
20494
9946c5fb4ff7
(message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20473
diff
changeset
|
4845 message_enable_multibyte = multibyte; |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
4846 |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4847 if (noninteractive) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4848 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4849 if (noninteractive_need_newline) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4850 putc ('\n', stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4851 noninteractive_need_newline = 0; |
18752
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
4852 if (m) |
8fce2f503ea9
(message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents:
18730
diff
changeset
|
4853 fwrite (m, len, 1, stderr); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4854 if (cursor_in_echo_area == 0) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4855 fprintf (stderr, "\n"); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4856 fflush (stderr); |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4857 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4858 /* 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
|
4859 initialized yet. Error messages get reported properly by |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4860 cmd_error, so this must be just an informative message; toss it. */ |
25012 | 4861 else if (INTERACTIVE |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4862 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4863 && FRAME_MESSAGE_BUF (sf)) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4864 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4865 Lisp_Object mini_window; |
25012 | 4866 struct frame *f; |
4867 | |
4868 /* Get the frame containing the mini-buffer | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4869 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4870 mini_window = FRAME_MINIBUF_WINDOW (sf); |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4871 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4872 |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4873 FRAME_SAMPLE_VISIBILITY (f); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4874 if (FRAME_VISIBLE_P (sf) |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4875 && ! FRAME_VISIBLE_P (f)) |
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4876 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4877 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4878 if (m) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4879 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4880 set_message (m, Qnil, len, multibyte); |
16660
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
4881 if (minibuffer_auto_raise) |
16f2e24baf42
(message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents:
16570
diff
changeset
|
4882 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
4883 } |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4884 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4885 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4886 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4887 do_pending_window_change (0); |
25012 | 4888 echo_area_display (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4889 do_pending_window_change (0); |
6661
a26e7181f36b
(display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents:
6650
diff
changeset
|
4890 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
4891 (*frame_up_to_date_hook) (f); |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4892 } |
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4893 } |
25012 | 4894 |
4895 | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4896 /* Display an echo area message M with a specified length of NBYTES |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4897 bytes. The string may include null characters. If M is not a |
25012 | 4898 string, clear out any existing message, and let the mini-buffer |
4899 text show through. */ | |
4900 | |
4901 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4902 message3 (m, nbytes, multibyte) |
25012 | 4903 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4904 int nbytes; |
25012 | 4905 int multibyte; |
4906 { | |
4907 struct gcpro gcpro1; | |
4908 | |
4909 GCPRO1 (m); | |
4910 | |
4911 /* First flush out any partial line written with print. */ | |
4912 message_log_maybe_newline (); | |
4913 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4914 message_dolog (XSTRING (m)->data, nbytes, 1, multibyte); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4915 message3_nolog (m, nbytes, multibyte); |
25012 | 4916 |
4917 UNGCPRO; | |
4918 } | |
4919 | |
4920 | |
4921 /* The non-logging version of message3. */ | |
4922 | |
4923 void | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4924 message3_nolog (m, nbytes, multibyte) |
25012 | 4925 Lisp_Object m; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4926 int nbytes, multibyte; |
25012 | 4927 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4928 struct frame *sf = SELECTED_FRAME (); |
25012 | 4929 message_enable_multibyte = multibyte; |
4930 | |
4931 if (noninteractive) | |
4932 { | |
4933 if (noninteractive_need_newline) | |
4934 putc ('\n', stderr); | |
4935 noninteractive_need_newline = 0; | |
4936 if (STRINGP (m)) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4937 fwrite (XSTRING (m)->data, nbytes, 1, stderr); |
25012 | 4938 if (cursor_in_echo_area == 0) |
4939 fprintf (stderr, "\n"); | |
4940 fflush (stderr); | |
4941 } | |
4942 /* A null message buffer means that the frame hasn't really been | |
4943 initialized yet. Error messages get reported properly by | |
4944 cmd_error, so this must be just an informative message; toss it. */ | |
4945 else if (INTERACTIVE | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4946 && sf->glyphs_initialized_p |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4947 && FRAME_MESSAGE_BUF (sf)) |
25012 | 4948 { |
4949 Lisp_Object mini_window; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4950 Lisp_Object frame; |
25012 | 4951 struct frame *f; |
4952 | |
4953 /* Get the frame containing the mini-buffer | |
4954 that the selected frame is using. */ | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4955 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4956 frame = XWINDOW (mini_window)->frame; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4957 f = XFRAME (frame); |
25012 | 4958 |
4959 FRAME_SAMPLE_VISIBILITY (f); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
4960 if (FRAME_VISIBLE_P (sf) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4961 && !FRAME_VISIBLE_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4962 Fmake_frame_visible (frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4963 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4964 if (STRINGP (m) && XSTRING (m)->size) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4965 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4966 set_message (NULL, m, nbytes, multibyte); |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
4967 if (minibuffer_auto_raise) |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
4968 Fraise_frame (frame); |
25012 | 4969 } |
4970 else | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4971 clear_message (1, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4972 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4973 do_pending_window_change (0); |
25012 | 4974 echo_area_display (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
4975 do_pending_window_change (0); |
25012 | 4976 if (frame_up_to_date_hook != 0 && ! gc_in_progress) |
4977 (*frame_up_to_date_hook) (f); | |
4978 } | |
4979 } | |
4980 | |
4981 | |
4982 /* Display a null-terminated echo area message M. If M is 0, clear | |
4983 out any existing message, and let the mini-buffer text show through. | |
4984 | |
4985 The buffer M must continue to exist until after the echo area gets | |
4986 cleared or some other message gets displayed there. Do not pass | |
4987 text that is stored in a Lisp string. Do not pass text in a buffer | |
4988 that was alloca'd. */ | |
1527
00109911b040
* xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents:
1446
diff
changeset
|
4989 |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4990 void |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4991 message1 (m) |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4992 char *m; |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4993 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
4994 message2 (m, (m ? strlen (m) : 0), 0); |
6366
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4995 } |
6f28d7614611
(message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents:
6342
diff
changeset
|
4996 |
25012 | 4997 |
4998 /* The non-logging counterpart of message1. */ | |
4999 | |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5000 void |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5001 message1_nolog (m) |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5002 char *m; |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5003 { |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5004 message2_nolog (m, (m ? strlen (m) : 0), 0); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5005 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5006 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5007 /* Display a message M which contains a single %s |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5008 which gets replaced with STRING. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5009 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5010 void |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5011 message_with_string (m, string, log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5012 char *m; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5013 Lisp_Object string; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5014 int log; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5015 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5016 if (noninteractive) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5017 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5018 if (m) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5019 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5020 if (noninteractive_need_newline) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5021 putc ('\n', stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5022 noninteractive_need_newline = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5023 fprintf (stderr, m, XSTRING (string)->data); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5024 if (cursor_in_echo_area == 0) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5025 fprintf (stderr, "\n"); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5026 fflush (stderr); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5027 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5028 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5029 else if (INTERACTIVE) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5030 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5031 /* The frame whose minibuffer we're going to display the message on. |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5032 It may be larger than the selected frame, so we need |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5033 to use its buffer, not the selected frame's buffer. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5034 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5035 struct frame *f, *sf = SELECTED_FRAME (); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5036 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5037 /* Get the frame containing the minibuffer |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5038 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5039 mini_window = FRAME_MINIBUF_WINDOW (sf); |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5040 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5041 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5042 /* A null message buffer means that the frame hasn't really been |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5043 initialized yet. Error messages get reported properly by |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5044 cmd_error, so this must be just an informative message; toss it. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5045 if (FRAME_MESSAGE_BUF (f)) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5046 { |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5047 int len; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5048 char *a[1]; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5049 a[0] = (char *) XSTRING (string)->data; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5050 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5051 len = doprnt (FRAME_MESSAGE_BUF (f), |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5052 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5053 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5054 if (log) |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5055 message2 (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5056 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5057 else |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5058 message2_nolog (FRAME_MESSAGE_BUF (f), len, |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5059 STRING_MULTIBYTE (string)); |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5060 |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5061 /* Print should start at the beginning of the message |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5062 buffer next time. */ |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5063 message_buf_print = 0; |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5064 } |
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5065 } |
10394
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5066 } |
afa796e2b954
(message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents:
10393
diff
changeset
|
5067 |
25012 | 5068 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5069 /* Dump an informative message to the minibuf. If M is 0, clear out |
25012 | 5070 any existing message, and let the mini-buffer text show through. */ |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5071 |
277 | 5072 /* VARARGS 1 */ |
5073 void | |
5074 message (m, a1, a2, a3) | |
5075 char *m; | |
8834
ba6936b88869
(message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
8797
diff
changeset
|
5076 EMACS_INT a1, a2, a3; |
277 | 5077 { |
5078 if (noninteractive) | |
5079 { | |
1446
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5080 if (m) |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5081 { |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5082 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
|
5083 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
|
5084 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
|
5085 fprintf (stderr, m, a1, a2, a3); |
2526
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5086 if (cursor_in_echo_area == 0) |
bcba821c17bc
(message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents:
2324
diff
changeset
|
5087 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
|
5088 fflush (stderr); |
37b3c2981b40
* xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents:
1124
diff
changeset
|
5089 } |
277 | 5090 } |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5091 else if (INTERACTIVE) |
277 | 5092 { |
25012 | 5093 /* The frame whose mini-buffer we're going to display the message |
5094 on. It may be larger than the selected frame, so we need to | |
5095 use its buffer, not the selected frame's buffer. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5096 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5097 struct frame *f, *sf = SELECTED_FRAME (); |
25012 | 5098 |
5099 /* Get the frame containing the mini-buffer | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5100 that the selected frame is using. */ |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5101 mini_window = FRAME_MINIBUF_WINDOW (sf); |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5102 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
277 | 5103 |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5104 /* 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
|
5105 initialized yet. Error messages get reported properly by |
25012 | 5106 cmd_error, so this must be just an informative message; toss |
5107 it. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5108 if (FRAME_MESSAGE_BUF (f)) |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5109 { |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5110 if (m) |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5111 { |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5112 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
|
5113 #ifdef NO_ARG_ARRAY |
20376
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5114 char *a[3]; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5115 a[0] = (char *) a1; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5116 a[1] = (char *) a2; |
67f1753dc577
(message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents:
20363
diff
changeset
|
5117 a[2] = (char *) a3; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5118 |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5119 len = doprnt (FRAME_MESSAGE_BUF (f), |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
5120 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)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
|
5121 #else |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5122 len = doprnt (FRAME_MESSAGE_BUF (f), |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5123 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
5124 (char **) &a1); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5125 #endif /* NO_ARG_ARRAY */ |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
5126 |
20628
05919533e157
(message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20580
diff
changeset
|
5127 message2 (FRAME_MESSAGE_BUF (f), len, 0); |
1873
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5128 } |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5129 else |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5130 message1 (0); |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5131 |
c5038f47c602
* xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents:
1785
diff
changeset
|
5132 /* 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
|
5133 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
|
5134 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
|
5135 } |
277 | 5136 } |
5137 } | |
5138 | |
25012 | 5139 |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5140 /* The non-logging version of message. */ |
25012 | 5141 |
11193 | 5142 void |
5143 message_nolog (m, a1, a2, a3) | |
5144 char *m; | |
5145 EMACS_INT a1, a2, a3; | |
5146 { | |
5147 Lisp_Object old_log_max; | |
5148 old_log_max = Vmessage_log_max; | |
5149 Vmessage_log_max = Qnil; | |
5150 message (m, a1, a2, a3); | |
5151 Vmessage_log_max = old_log_max; | |
5152 } | |
5153 | |
25012 | 5154 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5155 /* Display the current message in the current mini-buffer. This is |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5156 only called from error handlers in process.c, and is not time |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5157 critical. */ |
25012 | 5158 |
9088
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5159 void |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5160 update_echo_area () |
f29b14d21b26
(update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8943
diff
changeset
|
5161 { |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5162 if (!NILP (echo_area_buffer[0])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5163 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5164 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5165 string = Fcurrent_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5166 message3 (string, XSTRING (string)->size, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5167 !NILP (current_buffer->enable_multibyte_characters)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5168 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5169 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5170 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5171 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5172 /* Call FN with args A1..A5 with either the current or last displayed |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5173 echo_area_buffer as current buffer. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5174 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5175 WHICH zero means use the current message buffer |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5176 echo_area_buffer[0]. If that is nil, choose a suitable buffer |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5177 from echo_buffer[] and clear it. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5178 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5179 WHICH > 0 means use echo_area_buffer[1]. If that is nil, choose a |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5180 suitable buffer from echo_buffer[] and clear it. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5181 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5182 If WHICH < 0, set echo_area_buffer[1] to echo_area_buffer[0], so |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5183 that the current message becomes the last displayed one, make |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5184 choose a suitable buffer for echo_area_buffer[0], and clear it. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5185 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5186 Value is what FN returns. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5187 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5188 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5189 with_echo_area_buffer (w, which, fn, a1, a2, a3, a4, a5) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5190 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5191 int which; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5192 int (*fn) (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5193 int a1, a2, a3, a4, a5; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5194 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5195 Lisp_Object buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5196 int i, this_one, the_other, clear_buffer_p, rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5197 int count = specpdl_ptr - specpdl; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5198 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5199 /* If buffers aren't life, make new ones. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5200 for (i = 0; i < 2; ++i) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5201 if (!BUFFERP (echo_buffer[i]) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5202 || NILP (XBUFFER (echo_buffer[i])->name)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5203 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5204 char name[30]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5205 sprintf (name, " *Echo Area %d*", i); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5206 echo_buffer[i] = Fget_buffer_create (build_string (name)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5207 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5208 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5209 clear_buffer_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5210 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5211 if (which == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5212 this_one = 0, the_other = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5213 else if (which > 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5214 this_one = 1, the_other = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5215 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5216 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5217 this_one = 0, the_other = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5218 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5219 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5220 /* We need a fresh one in case the current echo buffer equals |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5221 the one containing the last displayed echo area message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5222 if (!NILP (echo_area_buffer[this_one]) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5223 && EQ (echo_area_buffer[this_one], echo_area_buffer[the_other])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5224 echo_area_buffer[this_one] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5225 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5226 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5227 /* Choose a suitable buffer from echo_buffer[] is we don't |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5228 have one. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5229 if (NILP (echo_area_buffer[this_one])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5230 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5231 echo_area_buffer[this_one] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5232 = (EQ (echo_area_buffer[the_other], echo_buffer[this_one]) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5233 ? echo_buffer[the_other] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5234 : echo_buffer[this_one]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5235 clear_buffer_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5236 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5237 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5238 buffer = echo_area_buffer[this_one]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5239 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5240 record_unwind_protect (unwind_with_echo_area_buffer, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5241 with_echo_area_buffer_unwind_data (w)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5242 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5243 /* Make the echo area buffer current. Note that for display |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5244 purposes, it is not necessary that the displayed window's buffer |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5245 == current_buffer, except for text property lookup. So, let's |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5246 only set that buffer temporarily here without doing a full |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5247 Fset_window_buffer. We must also change w->pointm, though, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5248 because otherwise an assertions in unshow_buffer fails, and Emacs |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5249 aborts. */ |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5250 set_buffer_internal_1 (XBUFFER (buffer)); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5251 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5252 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5253 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5254 set_marker_both (w->pointm, buffer, BEG, BEG_BYTE); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5255 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5256 current_buffer->truncate_lines = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5257 current_buffer->undo_list = Qt; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5258 current_buffer->read_only = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5259 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5260 if (clear_buffer_p && Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5261 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5262 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5263 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5264 xassert (ZV <= Z && ZV >= BEGV); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5265 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5266 rc = fn (a1, a2, a3, a4, a5); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5267 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5268 xassert (BEGV >= BEG); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5269 xassert (ZV <= Z && ZV >= BEGV); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5270 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5271 unbind_to (count, Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5272 return rc; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5273 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5274 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5275 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5276 /* Save state that should be preserved around the call to the function |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5277 FN called in with_echo_area_buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5278 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5279 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5280 with_echo_area_buffer_unwind_data (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5281 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5282 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5283 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5284 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5285 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5286 /* Reduce consing by keeping one vector in |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5287 Vwith_echo_area_save_vector. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5288 vector = Vwith_echo_area_save_vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5289 Vwith_echo_area_save_vector = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5290 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5291 if (NILP (vector)) |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5292 vector = Fmake_vector (make_number (7), Qnil); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5293 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5294 XSETBUFFER (XVECTOR (vector)->contents[i], current_buffer); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5295 XVECTOR (vector)->contents[i++] = Vdeactivate_mark; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5296 XVECTOR (vector)->contents[i++] = make_number (windows_or_buffers_changed); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5297 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5298 if (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5299 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5300 XSETWINDOW (XVECTOR (vector)->contents[i], w); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5301 XVECTOR (vector)->contents[i++] = w->buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5302 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5303 = make_number (XMARKER (w->pointm)->charpos); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5304 XVECTOR (vector)->contents[i++] |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5305 = make_number (XMARKER (w->pointm)->bytepos); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5306 } |
25012 | 5307 else |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5308 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5309 int end = i + 4; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5310 while (i < end) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5311 XVECTOR (vector)->contents[i++] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5312 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5313 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5314 xassert (i == XVECTOR (vector)->size); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5315 return vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5316 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5317 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5318 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5319 /* Restore global state from VECTOR which was created by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5320 with_echo_area_buffer_unwind_data. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5321 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5322 static Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5323 unwind_with_echo_area_buffer (vector) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5324 Lisp_Object vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5325 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5326 int i = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5327 |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5328 set_buffer_internal_1 (XBUFFER (XVECTOR (vector)->contents[i])); ++i; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5329 Vdeactivate_mark = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5330 windows_or_buffers_changed = XFASTINT (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5331 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5332 if (WINDOWP (XVECTOR (vector)->contents[i])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5333 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5334 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5335 Lisp_Object buffer, charpos, bytepos; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5336 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5337 w = XWINDOW (XVECTOR (vector)->contents[i]); ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5338 buffer = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5339 charpos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5340 bytepos = XVECTOR (vector)->contents[i]; ++i; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5341 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5342 w->buffer = buffer; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5343 set_marker_both (w->pointm, buffer, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5344 XFASTINT (charpos), XFASTINT (bytepos)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5345 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5346 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5347 Vwith_echo_area_save_vector = vector; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5348 return Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5349 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5350 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5351 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5352 /* Set up the echo area for use by print functions. MULTIBYTE_P |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5353 non-zero means we will print multibyte. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5354 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5355 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5356 setup_echo_area_for_printing (multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5357 int multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5358 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5359 if (!message_buf_print) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5360 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5361 /* A message has been output since the last time we printed. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5362 Choose a fresh echo area buffer. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5363 if (EQ (echo_area_buffer[1], echo_buffer[0])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5364 echo_area_buffer[0] = echo_buffer[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5365 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5366 echo_area_buffer[0] = echo_buffer[0]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5367 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5368 /* Switch to that buffer and clear it. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5369 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5370 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5371 del_range (BEG, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5372 TEMP_SET_PT_BOTH (BEG, BEG_BYTE); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5373 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5374 /* Set up the buffer for the multibyteness we need. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5375 if (multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5376 != !NILP (current_buffer->enable_multibyte_characters)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5377 Fset_buffer_multibyte (multibyte_p ? Qt : Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5378 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5379 /* Raise the frame containing the echo area. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5380 if (minibuffer_auto_raise) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5381 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5382 struct frame *sf = SELECTED_FRAME (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5383 Lisp_Object mini_window; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5384 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5385 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window))); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5386 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5387 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5388 message_buf_print = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5389 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5390 else if (current_buffer != XBUFFER (echo_area_buffer[0])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5391 /* Someone switched buffers between print requests. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5392 set_buffer_internal (XBUFFER (echo_area_buffer[0])); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5393 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5394 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5395 |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5396 /* Display an echo area message in window W. Value is non-zero if W's |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5397 height is changed. If display_last_displayed_message_p is |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5398 non-zero, display the message that was last displayed, otherwise |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5399 display the current message. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5400 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5401 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5402 display_echo_area (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5403 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5404 { |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5405 int i, no_message_p, window_height_changed_p; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5406 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5407 /* If there is no message, we must call display_echo_area_1 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5408 nevertheless because it resizes the window. But we will have to |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5409 reset the echo_area_buffer in question to nil at the end because |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5410 with_echo_area_buffer will sets it to an empty buffer. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5411 i = display_last_displayed_message_p ? 1 : 0; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5412 no_message_p = NILP (echo_area_buffer[i]); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5413 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5414 window_height_changed_p |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5415 = with_echo_area_buffer (w, display_last_displayed_message_p, |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5416 (int (*) ()) display_echo_area_1, w); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5417 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5418 if (no_message_p) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5419 echo_area_buffer[i] = Qnil; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5420 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5421 return window_height_changed_p; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5422 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5423 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5424 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5425 /* Helper for display_echo_area. Display the current buffer which |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5426 contains the current echo area message in window W, a mini-window. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5427 Change the height of W so that all of the message is displayed. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5428 Value is non-zero if height of W was changed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5429 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5430 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5431 display_echo_area_1 (w) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5432 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5433 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5434 Lisp_Object window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5435 struct text_pos start; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5436 int window_height_changed_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5437 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5438 /* Do this before displaying, so that we have a large enough glyph |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5439 matrix for the display. */ |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5440 window_height_changed_p = resize_mini_window (w, 0); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5441 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5442 /* Display. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5443 clear_glyph_matrix (w->desired_matrix); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5444 XSETWINDOW (window, w); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5445 SET_TEXT_POS (start, BEG, BEG_BYTE); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5446 try_window (window, start); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5447 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5448 return window_height_changed_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5449 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5450 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5451 |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5452 /* Resize the echo area window to exactly the size needed for the |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5453 currently displayed message, if there is one. */ |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5454 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5455 void |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5456 resize_echo_area_axactly () |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5457 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5458 if (BUFFERP (echo_area_buffer[0]) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5459 && WINDOWP (echo_area_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5460 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5461 struct window *w = XWINDOW (echo_area_window); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5462 int resized_p; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5463 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5464 resized_p = with_echo_area_buffer (w, 0, |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5465 (int (*) ()) resize_mini_window, |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5466 w, 1); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5467 if (resized_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5468 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5469 ++windows_or_buffers_changed; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5470 ++update_mode_lines; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5471 redisplay_internal (0); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5472 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5473 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5474 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5475 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5476 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5477 /* Resize mini-window W to fit the size of its contents. EXACT:P |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5478 means size the window exactly to the size needed. Otherwise, it's |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5479 only enlarged until W's buffer is empty. Value is non-zero if |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5480 the window height has been changed. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5481 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5482 int |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5483 resize_mini_window (w, exact_p) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5484 struct window *w; |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
5485 int exact_p; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5486 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5487 struct frame *f = XFRAME (w->frame); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5488 int window_height_changed_p = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5489 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5490 xassert (MINI_WINDOW_P (w)); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5491 |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5492 /* Nil means don't try to resize. */ |
25832
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5493 if (NILP (Vmax_mini_window_height) |
148a6733cd83
(resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents:
25820
diff
changeset
|
5494 || (FRAME_X_P (f) && f->output_data.x == NULL)) |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5495 return 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5496 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5497 if (!FRAME_MINIBUF_ONLY_P (f)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5498 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5499 struct it it; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5500 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5501 int total_height = XFASTINT (root->height) + XFASTINT (w->height); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5502 int height, max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5503 int unit = CANON_Y_UNIT (f); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5504 struct text_pos start; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5505 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5506 init_iterator (&it, w, BEGV, BEGV_BYTE, NULL, DEFAULT_FACE_ID); |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5507 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5508 /* Compute the max. number of lines specified by the user. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5509 if (FLOATP (Vmax_mini_window_height)) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5510 max_height = XFLOATINT (Vmax_mini_window_height) * total_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5511 else if (INTEGERP (Vmax_mini_window_height)) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5512 max_height = XINT (Vmax_mini_window_height); |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5513 else |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
5514 max_height = total_height / 4; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5515 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5516 /* Correct that max. height if it's bogus. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5517 max_height = max (1, max_height); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5518 max_height = min (total_height, max_height); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5519 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5520 /* Find out the height of the text in the window. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5521 move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5522 height = (unit - 1 + it.current_y + last_height) / unit; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5523 height = max (1, height); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5524 |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5525 /* Compute a suitable window start. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5526 if (height > max_height) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5527 { |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5528 height = max_height; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5529 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5530 move_it_vertically_backward (&it, (height - 1) * unit); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5531 start = it.current.pos; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5532 } |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5533 else |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5534 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5535 SET_MARKER_FROM_TEXT_POS (w->start, start); |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5536 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5537 /* Let it grow only, until we display an empty message, in which |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
5538 case the window shrinks again. */ |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5539 if (height > XFASTINT (w->height)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5540 { |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5541 int old_height = XFASTINT (w->height); |
25794
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5542 freeze_window_starts (f, 1); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5543 grow_mini_window (w, height - XFASTINT (w->height)); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5544 window_height_changed_p = XFASTINT (w->height) != old_height; |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5545 } |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5546 else if (height < XFASTINT (w->height) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5547 && (exact_p || BEGV == ZV)) |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5548 { |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5549 int old_height = XFASTINT (w->height); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5550 freeze_window_starts (f, 0); |
a6041d251b77
(resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents:
25778
diff
changeset
|
5551 shrink_mini_window (w); |
25729
7b888fb10913
(resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents:
25714
diff
changeset
|
5552 window_height_changed_p = XFASTINT (w->height) != old_height; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
5553 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5554 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5555 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5556 return window_height_changed_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5557 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5558 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5559 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5560 /* Value is the current message, a string, or nil if there is no |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5561 current message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5562 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5563 Lisp_Object |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5564 current_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5565 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5566 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5567 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5568 if (NILP (echo_area_buffer[0])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5569 msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5570 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5571 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5572 with_echo_area_buffer (0, 0, (int (*) ()) current_message_1, &msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5573 if (NILP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5574 echo_area_buffer[0] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5575 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5576 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5577 return msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5578 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5579 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5580 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5581 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5582 current_message_1 (msg) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5583 Lisp_Object *msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5584 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5585 if (Z > BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5586 *msg = make_buffer_string (BEG, Z, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5587 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5588 *msg = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5589 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5590 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5591 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5592 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5593 /* Push the current message on Vmessage_stack for later restauration |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5594 by restore_message. Value is non-zero if the current message isn't |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5595 empty. This is a relatively infrequent operation, so it's not |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5596 worth optimizing. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5597 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5598 int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5599 push_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5600 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5601 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5602 msg = current_message (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5603 Vmessage_stack = Fcons (msg, Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5604 return STRINGP (msg); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5605 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5606 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5607 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5608 /* Restore message display from the top of Vmessage_stack. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5609 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5610 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5611 restore_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5612 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5613 Lisp_Object msg; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5614 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5615 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5616 msg = XCAR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5617 if (STRINGP (msg)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5618 message3_nolog (msg, STRING_BYTES (XSTRING (msg)), STRING_MULTIBYTE (msg)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5619 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5620 message3_nolog (msg, 0, 0); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5621 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5622 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5623 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5624 /* Pop the top-most entry off Vmessage_stack. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5625 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5626 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5627 pop_message () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5628 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5629 xassert (CONSP (Vmessage_stack)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5630 Vmessage_stack = XCDR (Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5631 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5632 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5633 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5634 /* Check that Vmessage_stack is nil. Called from emacs.c when Emacs |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5635 exits. If the stack is not empty, we have a missing pop_message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5636 somewhere. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5637 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5638 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5639 check_message_stack () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5640 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5641 if (!NILP (Vmessage_stack)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5642 abort (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5643 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5644 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5645 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5646 /* Truncate to NCHARS what will be displayed in the echo area the next |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5647 time we display it---but don't redisplay it now. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5648 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5649 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5650 truncate_echo_area (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5651 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5652 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5653 if (nchars == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5654 echo_area_buffer[0] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5655 /* A null message buffer means that the frame hasn't really been |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5656 initialized yet. Error messages get reported properly by |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5657 cmd_error, so this must be just an informative message; toss it. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5658 else if (!noninteractive |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5659 && INTERACTIVE |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5660 && !NILP (echo_area_buffer[0])) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5661 { |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5662 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5663 if (FRAME_MESSAGE_BUF (sf)) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5664 with_echo_area_buffer (0, 0, (int (*) ()) truncate_message_1, nchars); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5665 } |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5666 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5667 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5668 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5669 /* Helper function for truncate_echo_area. Truncate the current |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5670 message to at most NCHARS characters. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5671 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5672 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5673 truncate_message_1 (nchars) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5674 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5675 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5676 if (BEG + nchars < Z) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5677 del_range (BEG + nchars, Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5678 if (Z == BEG) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5679 echo_area_buffer[0] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5680 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5681 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5682 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5683 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5684 /* Set the current message to a substring of S or STRING. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5685 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5686 If STRING is a Lisp string, set the message to the first NBYTES |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5687 bytes from STRING. NBYTES zero means use the whole string. If |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5688 STRING is multibyte, the message will be displayed multibyte. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5689 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5690 If S is not null, set the message to the first LEN bytes of S. LEN |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5691 zero means use the whole string. MULTIBYTE_P non-zero means S is |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5692 multibyte. Display the message multibyte in that case. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5693 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5694 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5695 set_message (s, string, nbytes, multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5696 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5697 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5698 int nbytes; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5699 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5700 message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5701 = ((s && multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5702 || (STRINGP (string) && STRING_MULTIBYTE (string))); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5703 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5704 with_echo_area_buffer (0, -1, (int (*) ()) set_message_1, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5705 s, string, nbytes, multibyte_p); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5706 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5707 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5708 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5709 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5710 /* Helper function for set_message. Arguments have the same meaning |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5711 as there. This function is called with the echo area buffer being |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5712 current. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5713 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5714 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5715 set_message_1 (s, string, nbytes, multibyte_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5716 char *s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5717 Lisp_Object string; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5718 int nbytes, multibyte_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5719 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5720 xassert (BEG == Z); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5721 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5722 /* Change multibyteness of the echo buffer appropriately. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5723 if (message_enable_multibyte |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5724 != !NILP (current_buffer->enable_multibyte_characters)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5725 Fset_buffer_multibyte (message_enable_multibyte ? Qt : Qnil); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5726 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5727 /* Insert new message at BEG. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5728 TEMP_SET_PT_BOTH (BEG, BEG_BYTE); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5729 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5730 if (STRINGP (string)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5731 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5732 int nchars; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5733 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5734 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5735 nbytes = XSTRING (string)->size_byte; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5736 nchars = string_byte_to_char (string, nbytes); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5737 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5738 /* This function takes care of single/multibyte conversion. We |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5739 just have to ensure that the echo area buffer has the right |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5740 setting of enable_multibyte_characters. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5741 insert_from_string (string, 0, 0, nchars, nbytes, 1); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5742 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5743 else if (s) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5744 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5745 if (nbytes == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5746 nbytes = strlen (s); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5747 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5748 if (multibyte_p && NILP (current_buffer->enable_multibyte_characters)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5749 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5750 /* Convert from multi-byte to single-byte. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5751 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5752 unsigned char work[1]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5753 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5754 /* Convert a multibyte string to single-byte. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5755 for (i = 0; i < nbytes; i += n) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5756 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5757 c = string_char_and_length (s + i, nbytes - i, &n); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5758 work[0] = (SINGLE_BYTE_CHAR_P (c) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5759 ? c |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5760 : multibyte_char_to_unibyte (c, Qnil)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5761 insert_1_both (work, 1, 1, 1, 0, 0); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5762 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5763 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5764 else if (!multibyte_p |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5765 && !NILP (current_buffer->enable_multibyte_characters)) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5766 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5767 /* Convert from single-byte to multi-byte. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5768 int i, c, n; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5769 unsigned char *msg = (unsigned char *) s; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5770 unsigned char *str, work[4]; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5771 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5772 /* Convert a single-byte string to multibyte. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5773 for (i = 0; i < nbytes; i++) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5774 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5775 c = unibyte_char_to_multibyte (msg[i]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5776 n = CHAR_STRING (c, work, str); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5777 insert_1_both (work, 1, n, 1, 0, 0); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5778 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5779 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5780 else |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5781 insert_1 (s, nbytes, 1, 0, 0); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5782 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5783 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5784 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5785 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5786 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5787 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5788 /* Clear messages. CURRENT_P non-zero means clear the current |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5789 message. LAST_DISPLAYED_P non-zero means clear the message |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5790 last displayed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5791 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5792 void |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5793 clear_message (current_p, last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5794 int current_p, last_displayed_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5795 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5796 if (current_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5797 echo_area_buffer[0] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5798 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5799 if (last_displayed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5800 echo_area_buffer[1] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5801 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5802 message_buf_print = 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5803 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5804 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5805 /* Clear garbaged frames. |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5806 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5807 This function is used where the old redisplay called |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5808 redraw_garbaged_frames which in turn called redraw_frame which in |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5809 turn called clear_frame. The call to clear_frame was a source of |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5810 flickering. I believe a clear_frame is not necessary. It should |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5811 suffice in the new redisplay to invalidate all current matrices, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5812 and ensure a complete redisplay of all windows. */ |
25012 | 5813 |
277 | 5814 static void |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5815 clear_garbaged_frames () |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5816 { |
769 | 5817 if (frame_garbaged) |
277 | 5818 { |
25012 | 5819 Lisp_Object tail, frame; |
5820 | |
5821 FOR_EACH_FRAME (tail, frame) | |
5822 { | |
5823 struct frame *f = XFRAME (frame); | |
5824 | |
5825 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | |
5826 { | |
5827 clear_current_matrices (f); | |
5828 f->garbaged = 0; | |
5829 } | |
5830 } | |
5831 | |
769 | 5832 frame_garbaged = 0; |
25012 | 5833 ++windows_or_buffers_changed; |
5834 } | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5835 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5836 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5837 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5838 /* Redisplay the echo area of the selected frame. If UPDATE_FRAME_P |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5839 is non-zero update selected_frame. Value is non-zero if the |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5840 mini-windows height has been changed. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5841 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5842 static int |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5843 echo_area_display (update_frame_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5844 int update_frame_p; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5845 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5846 Lisp_Object mini_window; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5847 struct window *w; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5848 struct frame *f; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5849 int window_height_changed_p = 0; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5850 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5851 |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
5852 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5853 w = XWINDOW (mini_window); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5854 f = XFRAME (WINDOW_FRAME (w)); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5855 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5856 /* Don't display if frame is invisible or not yet initialized. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5857 if (!FRAME_VISIBLE_P (f) || !f->glyphs_initialized_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5858 return 0; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5859 |
26103
90a7cc56474f
(echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents:
26088
diff
changeset
|
5860 #ifdef HAVE_X_WINDOWS |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5861 /* When Emacs starts, selected_frame may be a visible terminal |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5862 frame, even if we run under a window system. If we let this |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5863 through, a message would be displayed on the terminal. */ |
26203
47d54b67bce2
* xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
26197
diff
changeset
|
5864 if (EQ (selected_frame, Vterminal_frame) |
47d54b67bce2
* xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
26197
diff
changeset
|
5865 && !NILP (Vwindow_system)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5866 return 0; |
26103
90a7cc56474f
(echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents:
26088
diff
changeset
|
5867 #endif /* HAVE_X_WINDOWS */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5868 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5869 /* Redraw garbaged frames. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5870 if (frame_garbaged) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5871 clear_garbaged_frames (); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5872 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5873 if (!NILP (echo_area_buffer[0]) || minibuf_level == 0) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5874 { |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5875 echo_area_window = mini_window; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5876 window_height_changed_p = display_echo_area (w); |
25012 | 5877 w->must_be_updated_p = 1; |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5878 |
25012 | 5879 if (update_frame_p) |
5880 { | |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5881 /* Not called from redisplay_internal. If we changed |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5882 window configuration, we must redisplay thoroughly. |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5883 Otherwise, we can do with updating what we displayed |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5884 above. */ |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5885 if (window_height_changed_p) |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5886 { |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5887 ++windows_or_buffers_changed; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5888 ++update_mode_lines; |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5889 redisplay_internal (0); |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5890 } |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5891 else if (FRAME_WINDOW_P (f)) |
25012 | 5892 { |
5893 update_single_window (w, 1); | |
5894 rif->flush_display (f); | |
5895 } | |
5896 else | |
5897 update_frame (f, 1, 1); | |
5898 } | |
277 | 5899 } |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5900 else if (!EQ (mini_window, selected_window)) |
277 | 5901 windows_or_buffers_changed++; |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5902 |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
5903 /* Last displayed message is now the current message. */ |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5904 echo_area_buffer[1] = echo_area_buffer[0]; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
5905 |
25012 | 5906 /* Prevent redisplay optimization in redisplay_internal by resetting |
5907 this_line_start_pos. This is done because the mini-buffer now | |
5908 displays the message instead of its buffer text. */ | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
5909 if (EQ (mini_window, selected_window)) |
25012 | 5910 CHARPOS (this_line_start_pos) = 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5911 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
5912 return window_height_changed_p; |
25012 | 5913 } |
5914 | |
5915 | |
14465
0936d5e38928
Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
14299
diff
changeset
|
5916 |
25012 | 5917 /*********************************************************************** |
5918 Frame Titles | |
5919 ***********************************************************************/ | |
5920 | |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
5921 |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
5922 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 5923 |
5924 /* A buffer for constructing frame titles in it; allocated from the | |
5925 heap in init_xdisp and resized as needed in store_frame_title_char. */ | |
5926 | |
5927 static char *frame_title_buf; | |
5928 | |
5929 /* The buffer's end, and a current output position in it. */ | |
5930 | |
5931 static char *frame_title_buf_end; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5932 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
|
5933 |
25012 | 5934 |
5935 /* Store a single character C for the frame title in frame_title_buf. | |
5936 Re-allocate frame_title_buf if necessary. */ | |
5937 | |
5938 static void | |
5939 store_frame_title_char (c) | |
5940 char c; | |
5941 { | |
5942 /* If output position has reached the end of the allocated buffer, | |
5943 double the buffer's size. */ | |
5944 if (frame_title_ptr == frame_title_buf_end) | |
5945 { | |
5946 int len = frame_title_ptr - frame_title_buf; | |
5947 int new_size = 2 * len * sizeof *frame_title_buf; | |
5948 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size); | |
5949 frame_title_buf_end = frame_title_buf + new_size; | |
5950 frame_title_ptr = frame_title_buf + len; | |
5951 } | |
5952 | |
5953 *frame_title_ptr++ = c; | |
5954 } | |
5955 | |
5956 | |
5957 /* Store part of a frame title in frame_title_buf, beginning at | |
5958 frame_title_ptr. STR is the string to store. Do not copy more | |
5959 than PRECISION number of bytes from STR; PRECISION <= 0 means copy | |
5960 the whole string. Pad with spaces until FIELD_WIDTH number of | |
5961 characters have been copied; FIELD_WIDTH <= 0 means don't pad. | |
5962 Called from display_mode_element when it is used to build a frame | |
5963 title. */ | |
5964 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5965 static int |
25012 | 5966 store_frame_title (str, field_width, precision) |
5967 unsigned char *str; | |
5968 int field_width, precision; | |
5969 { | |
5970 int n = 0; | |
5971 | |
5972 /* Copy at most PRECISION chars from STR. */ | |
5973 while ((precision <= 0 || n < precision) | |
5974 && *str) | |
5975 { | |
5976 store_frame_title_char (*str++); | |
5977 ++n; | |
5978 } | |
5979 | |
5980 /* Fill up with spaces until FIELD_WIDTH reached. */ | |
5981 while (field_width > 0 | |
5982 && n < field_width) | |
5983 { | |
5984 store_frame_title_char (' '); | |
5985 ++n; | |
5986 } | |
5987 | |
5988 return n; | |
5989 } | |
5990 | |
5991 | |
5992 /* Set the title of FRAME, if it has changed. The title format is | |
5993 Vicon_title_format if FRAME is iconified, otherwise it is | |
5994 frame_title_format. */ | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
5995 |
6308
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
5996 static void |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
5997 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
|
5998 Lisp_Object frame; |
f34deea7dc2c
(x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents:
6278
diff
changeset
|
5999 { |
25012 | 6000 struct frame *f = XFRAME (frame); |
6001 | |
6002 if (FRAME_WINDOW_P (f) | |
6003 || FRAME_MINIBUF_ONLY_P (f) | |
6004 || f->explicit_name) | |
6005 { | |
6006 /* Do we have more than one visible frame on this X display? */ | |
6007 Lisp_Object tail; | |
6008 Lisp_Object fmt; | |
6009 struct buffer *obuf; | |
6010 int len; | |
6011 struct it it; | |
6012 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6013 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6014 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
6015 struct frame *tf = XFRAME (XCAR (tail)); |
25012 | 6016 |
6017 if (tf != f | |
6018 && FRAME_KBOARD (tf) == FRAME_KBOARD (f) | |
6019 && !FRAME_MINIBUF_ONLY_P (tf) | |
6020 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf))) | |
6021 break; | |
6022 } | |
6023 | |
6024 /* Set global variable indicating that multiple frames exist. */ | |
6025 multiple_frames = CONSP (tail); | |
6026 | |
6027 /* Switch to the buffer of selected window of the frame. Set up | |
6028 frame_title_ptr so that display_mode_element will output into it; | |
6029 then display the title. */ | |
6030 obuf = current_buffer; | |
6031 Fset_buffer (XWINDOW (f->selected_window)->buffer); | |
6032 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format; | |
6033 frame_title_ptr = frame_title_buf; | |
6034 init_iterator (&it, XWINDOW (f->selected_window), -1, -1, | |
6035 NULL, DEFAULT_FACE_ID); | |
6036 len = display_mode_element (&it, 0, -1, -1, fmt); | |
6037 frame_title_ptr = NULL; | |
6038 set_buffer_internal (obuf); | |
6039 | |
6040 /* Set the title only if it's changed. This avoids consing in | |
6041 the common case where it hasn't. (If it turns out that we've | |
6042 already wasted too much time by walking through the list with | |
6043 display_mode_element, then we might need to optimize at a | |
6044 higher level than this.) */ | |
6045 if (! STRINGP (f->name) | |
6046 || STRING_BYTES (XSTRING (f->name)) != len | |
6047 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0) | |
6048 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil); | |
6049 } | |
6050 } | |
6051 | |
6052 #else /* not HAVE_WINDOW_SYSTEM */ | |
6053 | |
8783
226c214398a6
[!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents:
8772
diff
changeset
|
6054 #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
|
6055 #define store_frame_title(str, mincol, maxcol) 0 |
25012 | 6056 |
6057 #endif /* not HAVE_WINDOW_SYSTEM */ | |
6058 | |
6059 | |
6060 | |
277 | 6061 |
25012 | 6062 /*********************************************************************** |
6063 Menu Bars | |
6064 ***********************************************************************/ | |
6065 | |
6066 | |
6067 /* Prepare for redisplay by updating menu-bar item lists when | |
6068 appropriate. This can call eval. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6069 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6070 void |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6071 prepare_menu_bars () |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6072 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6073 int all_windows; |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6074 struct gcpro gcpro1, gcpro2; |
25012 | 6075 struct frame *f; |
6076 struct frame *tooltip_frame; | |
6077 | |
6078 #ifdef HAVE_X_WINDOWS | |
6079 tooltip_frame = tip_frame; | |
6080 #else | |
6081 tooltip_frame = NULL; | |
6082 #endif | |
6083 | |
6084 /* Update all frame titles based on their buffer names, etc. We do | |
6085 this before the menu bars so that the buffer-menu will show the | |
6086 up-to-date frame titles. */ | |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6087 #ifdef HAVE_WINDOW_SYSTEM |
13826
cbe1d1a07eb2
(prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents:
13760
diff
changeset
|
6088 if (windows_or_buffers_changed || update_mode_lines) |
11920
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6089 { |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6090 Lisp_Object tail, frame; |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6091 |
d7c32bcc6cc5
(prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents:
11910
diff
changeset
|
6092 FOR_EACH_FRAME (tail, frame) |
25012 | 6093 { |
6094 f = XFRAME (frame); | |
6095 if (f != tooltip_frame | |
6096 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))) | |
6097 x_consider_frame_title (frame); | |
6098 } | |
6099 } | |
6100 #endif /* HAVE_WINDOW_SYSTEM */ | |
6101 | |
6102 /* Update the menu bar item lists, if appropriate. This has to be | |
6103 done before any actual redisplay or generation of display lines. */ | |
6104 all_windows = (update_mode_lines | |
6105 || buffer_shared > 1 | |
6106 || windows_or_buffers_changed); | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6107 if (all_windows) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6108 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6109 Lisp_Object tail, frame; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6110 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6111 |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6112 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6113 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6114 FOR_EACH_FRAME (tail, frame) |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6115 { |
25012 | 6116 f = XFRAME (frame); |
6117 | |
6118 /* Ignore tooltip frame. */ | |
6119 if (f == tooltip_frame) | |
6120 continue; | |
6121 | |
6122 /* If a window on this frame changed size, report that to | |
6123 the user and clear the size-change flag. */ | |
6124 if (FRAME_WINDOW_SIZES_CHANGED (f)) | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6125 { |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6126 Lisp_Object functions; |
25012 | 6127 |
6128 /* Clear flag first in case we get an error below. */ | |
6129 FRAME_WINDOW_SIZES_CHANGED (f) = 0; | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6130 functions = Vwindow_size_change_functions; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6131 GCPRO2 (tail, functions); |
25012 | 6132 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6133 while (CONSP (functions)) |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6134 { |
25012 | 6135 call1 (XCAR (functions), frame); |
6136 functions = XCDR (functions); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6137 } |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6138 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6139 } |
25012 | 6140 |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6141 GCPRO1 (tail); |
25012 | 6142 update_menu_bar (f, 0); |
6143 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 6144 update_tool_bar (f, 0); |
25012 | 6145 #endif |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6146 UNGCPRO; |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
6147 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6148 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6149 unbind_to (count, Qnil); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6150 } |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6151 else |
25012 | 6152 { |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6153 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6154 update_menu_bar (sf, 1); |
25012 | 6155 #ifdef HAVE_WINDOW_SYSTEM |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6156 update_tool_bar (sf, 1); |
25012 | 6157 #endif |
6158 } | |
6159 | |
6160 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
6161 pending_menu_activation is not defined. */ | |
15813
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6162 #ifdef USE_X_TOOLKIT |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6163 pending_menu_activation = 0; |
c52454296042
(prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15543
diff
changeset
|
6164 #endif |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6165 } |
25012 | 6166 |
6167 | |
6168 /* Update the menu bar item list for frame F. This has to be done | |
6169 before we start to fill in any display lines, because it can call | |
6170 eval. | |
6171 | |
6172 If SAVE_MATCH_DATA is non-zero, we must save and restore it here. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6173 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6174 static void |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6175 update_menu_bar (f, save_match_data) |
25012 | 6176 struct frame *f; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6177 int save_match_data; |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6178 { |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6179 Lisp_Object window; |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6180 register struct window *w; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6181 |
6872
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6182 window = FRAME_SELECTED_WINDOW (f); |
7c12310c8b86
(update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents:
6741
diff
changeset
|
6183 w = XWINDOW (window); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6184 |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6185 if (update_mode_lines) |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6186 w->update_mode_line = Qt; |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6187 |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6188 if (FRAME_WINDOW_P (f) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6189 ? |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
6190 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6191 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
|
6192 #else |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
6193 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
|
6194 #endif |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6195 : FRAME_MENU_BAR_LINES (f) > 0) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6196 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6197 /* 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
|
6198 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
|
6199 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
|
6200 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
|
6201 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
|
6202 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
|
6203 windows_or_buffers_changed anyway. */ |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6204 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
|
6205 || !NILP (w->update_mode_line) |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6206 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6207 < BUF_MODIFF (XBUFFER (w->buffer))) |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6208 != !NILP (w->last_had_star)) |
12022
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6209 || ((!NILP (Vtransient_mark_mode) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6210 && !NILP (XBUFFER (w->buffer)->mark_active)) |
497ad07c31c2
(update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents:
12017
diff
changeset
|
6211 != !NILP (w->region_showing))) |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6212 { |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6213 struct buffer *prev = current_buffer; |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6214 int count = specpdl_ptr - specpdl; |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6215 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6216 set_buffer_internal_1 (XBUFFER (w->buffer)); |
12017
0d73575a1c0e
(update_menu_bar): Reverse test of save_match_data.
Karl Heuer <kwzh@gnu.org>
parents:
11971
diff
changeset
|
6217 if (save_match_data) |
21179
482ff111ccbc
(message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
21028
diff
changeset
|
6218 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6219 if (NILP (Voverriding_local_map_menu_flag)) |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6220 { |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6221 specbind (Qoverriding_terminal_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6222 specbind (Qoverriding_local_map, Qnil); |
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
6223 } |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6224 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6225 /* Run the Lucid hook. */ |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6226 call1 (Vrun_hooks, Qactivate_menubar_hook); |
25012 | 6227 |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6228 /* If it has changed current-menubar from previous value, |
25012 | 6229 really recompute the menu-bar from the value. */ |
12141
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6230 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
9265a67ccf1a
(update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents:
12081
diff
changeset
|
6231 call0 (Qrecompute_lucid_menubar); |
25012 | 6232 |
14299 | 6233 safe_run_hooks (Qmenu_bar_update_hook); |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
6234 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
25012 | 6235 |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6236 /* Redisplay the menu bar in case we changed it. */ |
13419
2a17eca35e88
[HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13370
diff
changeset
|
6237 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
14265
9bc9be522a4d
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents:
14263
diff
changeset
|
6238 if (FRAME_WINDOW_P (f)) |
13459
96fdfde22e87
(display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents:
13419
diff
changeset
|
6239 set_frame_menubar (f, 0, 0); |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6240 else |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6241 /* On a terminal screen, the menu bar is an ordinary screen |
25012 | 6242 line, and this makes it get updated. */ |
15543
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6243 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6244 #else /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6245 /* In the non-toolkit version, the menu bar is an ordinary screen |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6246 line, and this makes it get updated. */ |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6247 w->update_mode_line = Qt; |
1047c2816dd4
(redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents:
15382
diff
changeset
|
6248 #endif /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */ |
11761
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6249 |
d110042c1d95
(prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents:
11719
diff
changeset
|
6250 unbind_to (count, Qnil); |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
6251 set_buffer_internal_1 (prev); |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6252 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6253 } |
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6254 } |
25012 | 6255 |
6256 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6257 |
25012 | 6258 /*********************************************************************** |
25543 | 6259 Tool-bars |
25012 | 6260 ***********************************************************************/ |
6261 | |
6262 #ifdef HAVE_WINDOW_SYSTEM | |
6263 | |
25543 | 6264 /* Update the tool-bar item list for frame F. This has to be done |
25012 | 6265 before we start to fill in any display lines. Called from |
6266 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save | |
6267 and restore it here. */ | |
6268 | |
6269 static void | |
25543 | 6270 update_tool_bar (f, save_match_data) |
25012 | 6271 struct frame *f; |
6272 int save_match_data; | |
6273 { | |
25543 | 6274 if (WINDOWP (f->tool_bar_window) |
6275 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0) | |
25012 | 6276 { |
6277 Lisp_Object window; | |
6278 struct window *w; | |
6279 | |
6280 window = FRAME_SELECTED_WINDOW (f); | |
6281 w = XWINDOW (window); | |
6282 | |
6283 /* If the user has switched buffers or windows, we need to | |
6284 recompute to reflect the new bindings. But we'll | |
6285 recompute when update_mode_lines is set too; that means | |
6286 that people can use force-mode-line-update to request | |
6287 that the menu bar be recomputed. The adverse effect on | |
6288 the rest of the redisplay algorithm is about the same as | |
6289 windows_or_buffers_changed anyway. */ | |
6290 if (windows_or_buffers_changed | |
6291 || !NILP (w->update_mode_line) | |
6292 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
6293 < BUF_MODIFF (XBUFFER (w->buffer))) | |
6294 != !NILP (w->last_had_star)) | |
6295 || ((!NILP (Vtransient_mark_mode) | |
6296 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
6297 != !NILP (w->region_showing))) | |
6298 { | |
6299 struct buffer *prev = current_buffer; | |
6300 int count = specpdl_ptr - specpdl; | |
6301 | |
6302 /* Set current_buffer to the buffer of the selected | |
6303 window of the frame, so that we get the right local | |
6304 keymaps. */ | |
6305 set_buffer_internal_1 (XBUFFER (w->buffer)); | |
6306 | |
6307 /* Save match data, if we must. */ | |
6308 if (save_match_data) | |
6309 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); | |
6310 | |
6311 /* Make sure that we don't accidentally use bogus keymaps. */ | |
6312 if (NILP (Voverriding_local_map_menu_flag)) | |
6313 { | |
6314 specbind (Qoverriding_terminal_local_map, Qnil); | |
6315 specbind (Qoverriding_local_map, Qnil); | |
6316 } | |
6317 | |
25543 | 6318 /* Build desired tool-bar items from keymaps. */ |
6319 f->desired_tool_bar_items | |
6320 = tool_bar_items (f->desired_tool_bar_items, | |
6321 &f->n_desired_tool_bar_items); | |
25012 | 6322 |
25543 | 6323 /* Redisplay the tool-bar in case we changed it. */ |
25012 | 6324 w->update_mode_line = Qt; |
6325 | |
6326 unbind_to (count, Qnil); | |
6327 set_buffer_internal_1 (prev); | |
6328 } | |
6329 } | |
6330 } | |
6331 | |
6332 | |
25543 | 6333 /* Set F->desired_tool_bar_string to a Lisp string representing frame |
6334 F's desired tool-bar contents. F->desired_tool_bar_items must have | |
25012 | 6335 been set up previously by calling prepare_menu_bars. */ |
6336 | |
6337 static void | |
25543 | 6338 build_desired_tool_bar_string (f) |
25012 | 6339 struct frame *f; |
6340 { | |
6341 int i, size, size_needed, string_idx; | |
6342 struct gcpro gcpro1, gcpro2, gcpro3; | |
6343 Lisp_Object image, plist, props; | |
6344 | |
6345 image = plist = props = Qnil; | |
6346 GCPRO3 (image, plist, props); | |
6347 | |
25543 | 6348 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so. |
25012 | 6349 Otherwise, make a new string. */ |
6350 | |
6351 /* The size of the string we might be able to reuse. */ | |
25543 | 6352 size = (STRINGP (f->desired_tool_bar_string) |
6353 ? XSTRING (f->desired_tool_bar_string)->size | |
25012 | 6354 : 0); |
6355 | |
6356 /* Each image in the string we build is preceded by a space, | |
6357 and there is a space at the end. */ | |
25543 | 6358 size_needed = f->n_desired_tool_bar_items + 1; |
6359 | |
6360 /* Reuse f->desired_tool_bar_string, if possible. */ | |
25012 | 6361 if (size < size_needed) |
25543 | 6362 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), ' '); |
25012 | 6363 else |
6364 { | |
6365 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | |
6366 Fremove_text_properties (make_number (0), make_number (size), | |
25543 | 6367 props, f->desired_tool_bar_string); |
25012 | 6368 } |
6369 | |
6370 /* Put a `display' property on the string for the images to display, | |
25543 | 6371 put a `menu_item' property on tool-bar items with a value that |
6372 is the index of the item in F's tool-bar item vector. */ | |
25012 | 6373 for (i = 0, string_idx = 0; |
25543 | 6374 i < f->n_desired_tool_bar_items; |
25012 | 6375 ++i, string_idx += 1) |
6376 { | |
6377 #define PROP(IDX) \ | |
25543 | 6378 (XVECTOR (f->desired_tool_bar_items) \ |
6379 ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)]) | |
6380 | |
6381 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
6382 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
25012 | 6383 int margin, relief; |
6384 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage; | |
6385 extern Lisp_Object Qlaplace; | |
6386 | |
6387 /* If image is a vector, choose the image according to the | |
6388 button state. */ | |
25543 | 6389 image = PROP (TOOL_BAR_ITEM_IMAGES); |
25012 | 6390 if (VECTORP (image)) |
6391 { | |
25543 | 6392 enum tool_bar_item_image idx; |
25012 | 6393 |
6394 if (enabled_p) | |
6395 idx = (selected_p | |
25543 | 6396 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
6397 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
25012 | 6398 else |
6399 idx = (selected_p | |
25543 | 6400 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
6401 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
25012 | 6402 |
6403 xassert (XVECTOR (image)->size >= idx); | |
6404 image = XVECTOR (image)->contents[idx]; | |
6405 } | |
6406 | |
6407 /* Ignore invalid image specifications. */ | |
6408 if (!valid_image_p (image)) | |
6409 continue; | |
6410 | |
25543 | 6411 /* Display the tool-bar button pressed, or depressed. */ |
25012 | 6412 plist = Fcopy_sequence (XCDR (image)); |
6413 | |
6414 /* Compute margin and relief to draw. */ | |
25543 | 6415 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3; |
6416 margin = relief + max (0, tool_bar_button_margin); | |
6417 | |
6418 if (auto_raise_tool_bar_buttons_p) | |
25012 | 6419 { |
6420 /* Add a `:relief' property to the image spec if the item is | |
6421 selected. */ | |
6422 if (selected_p) | |
6423 { | |
6424 plist = Fplist_put (plist, QCrelief, make_number (-relief)); | |
6425 margin -= relief; | |
6426 } | |
6427 } | |
6428 else | |
6429 { | |
6430 /* If image is selected, display it pressed, i.e. with a | |
6431 negative relief. If it's not selected, display it with a | |
6432 raised relief. */ | |
6433 plist = Fplist_put (plist, QCrelief, | |
6434 (selected_p | |
6435 ? make_number (-relief) | |
6436 : make_number (relief))); | |
6437 margin -= relief; | |
6438 } | |
6439 | |
6440 /* Put a margin around the image. */ | |
6441 if (margin) | |
6442 plist = Fplist_put (plist, QCmargin, make_number (margin)); | |
6443 | |
6444 /* If button is not enabled, make the image appear disabled by | |
6445 applying an appropriate algorithm to it. */ | |
6446 if (!enabled_p) | |
6447 plist = Fplist_put (plist, QCalgorithm, Qlaplace); | |
6448 | |
6449 /* Put a `display' text property on the string for the image to | |
6450 display. Put a `menu-item' property on the string that gives | |
25543 | 6451 the start of this item's properties in the tool-bar items |
25012 | 6452 vector. */ |
6453 image = Fcons (Qimage, plist); | |
6454 props = list4 (Qdisplay, image, | |
25543 | 6455 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)), |
25012 | 6456 Fadd_text_properties (make_number (string_idx), |
6457 make_number (string_idx + 1), | |
25543 | 6458 props, f->desired_tool_bar_string); |
25012 | 6459 #undef PROP |
6460 } | |
6461 | |
6462 UNGCPRO; | |
6463 } | |
6464 | |
6465 | |
25543 | 6466 /* Display one line of the tool-bar of frame IT->f. */ |
25012 | 6467 |
6468 static void | |
25543 | 6469 display_tool_bar_line (it) |
25012 | 6470 struct it *it; |
6471 { | |
6472 struct glyph_row *row = it->glyph_row; | |
6473 int max_x = it->last_visible_x; | |
6474 struct glyph *last; | |
6475 | |
6476 prepare_desired_row (row); | |
6477 row->y = it->current_y; | |
6478 | |
6479 while (it->current_x < max_x) | |
6480 { | |
6481 int x_before, x, n_glyphs_before, i, nglyphs; | |
6482 | |
6483 /* Get the next display element. */ | |
6484 if (!get_next_display_element (it)) | |
6485 break; | |
6486 | |
6487 /* Produce glyphs. */ | |
6488 x_before = it->current_x; | |
6489 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
6490 PRODUCE_GLYPHS (it); | |
6491 | |
6492 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
6493 i = 0; | |
6494 x = x_before; | |
6495 while (i < nglyphs) | |
6496 { | |
6497 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
6498 | |
6499 if (x + glyph->pixel_width > max_x) | |
6500 { | |
6501 /* Glyph doesn't fit on line. */ | |
6502 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
6503 it->current_x = x; | |
6504 goto out; | |
6505 } | |
6506 | |
6507 ++it->hpos; | |
6508 x += glyph->pixel_width; | |
6509 ++i; | |
6510 } | |
6511 | |
6512 /* Stop at line ends. */ | |
6513 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
6514 break; | |
6515 | |
6516 set_iterator_to_next (it); | |
6517 } | |
6518 | |
6519 out:; | |
6520 | |
6521 row->displays_text_p = row->used[TEXT_AREA] != 0; | |
6522 extend_face_to_end_of_line (it); | |
6523 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; | |
6524 last->right_box_line_p = 1; | |
6525 compute_line_metrics (it); | |
6526 | |
25543 | 6527 /* If line is empty, make it occupy the rest of the tool-bar. */ |
25012 | 6528 if (!row->displays_text_p) |
6529 { | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
6530 row->height = row->phys_height = it->last_visible_y - row->y; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
6531 row->ascent = row->phys_ascent = 0; |
25012 | 6532 } |
6533 | |
6534 row->full_width_p = 1; | |
6535 row->continued_p = 0; | |
6536 row->truncated_on_left_p = 0; | |
6537 row->truncated_on_right_p = 0; | |
6538 | |
6539 it->current_x = it->hpos = 0; | |
6540 it->current_y += row->height; | |
6541 ++it->vpos; | |
6542 ++it->glyph_row; | |
6543 } | |
6544 | |
6545 | |
25543 | 6546 /* Value is the number of screen lines needed to make all tool-bar |
25012 | 6547 items of frame F visible. */ |
6548 | |
6549 static int | |
25543 | 6550 tool_bar_lines_needed (f) |
25012 | 6551 struct frame *f; |
6552 { | |
25543 | 6553 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 6554 struct it it; |
6555 | |
25543 | 6556 /* Initialize an iterator for iteration over |
6557 F->desired_tool_bar_string in the tool-bar window of frame F. */ | |
6558 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 6559 it.first_visible_x = 0; |
6560 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
25543 | 6561 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); |
25012 | 6562 |
6563 while (!ITERATOR_AT_END_P (&it)) | |
6564 { | |
6565 it.glyph_row = w->desired_matrix->rows; | |
6566 clear_glyph_row (it.glyph_row); | |
25543 | 6567 display_tool_bar_line (&it); |
25012 | 6568 } |
6569 | |
6570 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | |
6571 } | |
6572 | |
6573 | |
25543 | 6574 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's |
25012 | 6575 height should be changed. */ |
6576 | |
6577 static int | |
25543 | 6578 redisplay_tool_bar (f) |
25012 | 6579 struct frame *f; |
6580 { | |
6581 struct window *w; | |
6582 struct it it; | |
6583 struct glyph_row *row; | |
6584 int change_height_p = 0; | |
6585 | |
25543 | 6586 /* If frame hasn't a tool-bar window or if it is zero-height, don't |
6587 do anything. This means you must start with tool-bar-lines | |
25012 | 6588 non-zero to get the auto-sizing effect. Or in other words, you |
25543 | 6589 can turn off tool-bars by specifying tool-bar-lines zero. */ |
6590 if (!WINDOWP (f->tool_bar_window) | |
6591 || (w = XWINDOW (f->tool_bar_window), | |
25012 | 6592 XFASTINT (w->height) == 0)) |
6593 return 0; | |
6594 | |
25543 | 6595 /* Set up an iterator for the tool-bar window. */ |
6596 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID); | |
25012 | 6597 it.first_visible_x = 0; |
6598 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
6599 row = it.glyph_row; | |
6600 | |
25543 | 6601 /* Build a string that represents the contents of the tool-bar. */ |
6602 build_desired_tool_bar_string (f); | |
6603 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1); | |
6604 | |
6605 /* Display as many lines as needed to display all tool-bar items. */ | |
25012 | 6606 while (it.current_y < it.last_visible_y) |
25543 | 6607 display_tool_bar_line (&it); |
6608 | |
6609 /* It doesn't make much sense to try scrolling in the tool-bar | |
25012 | 6610 window, so don't do it. */ |
6611 w->desired_matrix->no_scrolling_p = 1; | |
6612 w->must_be_updated_p = 1; | |
6613 | |
25543 | 6614 if (auto_resize_tool_bars_p) |
25012 | 6615 { |
6616 int nlines; | |
6617 | |
6618 /* If there are blank lines at the end, except for a partially | |
6619 visible blank line at the end that is smaller than | |
25543 | 6620 CANON_Y_UNIT, change the tool-bar's height. */ |
25012 | 6621 row = it.glyph_row - 1; |
6622 if (!row->displays_text_p | |
6623 && row->height >= CANON_Y_UNIT (f)) | |
6624 change_height_p = 1; | |
6625 | |
25543 | 6626 /* If row displays tool-bar items, but is partially visible, |
6627 change the tool-bar's height. */ | |
25012 | 6628 if (row->displays_text_p |
6629 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y) | |
6630 change_height_p = 1; | |
6631 | |
25543 | 6632 /* Resize windows as needed by changing the `tool-bar-lines' |
25012 | 6633 frame parameter. */ |
6634 if (change_height_p | |
25543 | 6635 && (nlines = tool_bar_lines_needed (f), |
25012 | 6636 nlines != XFASTINT (w->height))) |
6637 { | |
25543 | 6638 extern Lisp_Object Qtool_bar_lines; |
25012 | 6639 Lisp_Object frame; |
6640 | |
6641 XSETFRAME (frame, f); | |
6642 clear_glyph_matrix (w->desired_matrix); | |
6643 Fmodify_frame_parameters (frame, | |
25543 | 6644 Fcons (Fcons (Qtool_bar_lines, |
25012 | 6645 make_number (nlines)), |
6646 Qnil)); | |
6647 fonts_changed_p = 1; | |
6648 } | |
6649 } | |
6650 | |
6651 return change_height_p; | |
6652 } | |
6653 | |
6654 | |
25543 | 6655 /* Get information about the tool-bar item which is displayed in GLYPH |
6656 on frame F. Return in *PROP_IDX the index where tool-bar item | |
6657 properties start in F->current_tool_bar_items. Value is zero if | |
6658 GLYPH doesn't display a tool-bar item. */ | |
25012 | 6659 |
6660 int | |
25543 | 6661 tool_bar_item_info (f, glyph, prop_idx) |
25012 | 6662 struct frame *f; |
6663 struct glyph *glyph; | |
6664 int *prop_idx; | |
6665 { | |
6666 Lisp_Object prop; | |
6667 int success_p; | |
6668 | |
6669 /* Get the text property `menu-item' at pos. The value of that | |
6670 property is the start index of this item's properties in | |
25543 | 6671 F->current_tool_bar_items. */ |
25012 | 6672 prop = Fget_text_property (make_number (glyph->charpos), |
25543 | 6673 Qmenu_item, f->current_tool_bar_string); |
25012 | 6674 if (INTEGERP (prop)) |
6675 { | |
6676 *prop_idx = XINT (prop); | |
6677 success_p = 1; | |
6678 } | |
6679 else | |
6680 success_p = 0; | |
6681 | |
6682 return success_p; | |
6683 } | |
6684 | |
6685 #endif /* HAVE_WINDOW_SYSTEM */ | |
6686 | |
6687 | |
6688 | |
6689 /************************************************************************ | |
6690 Horizontal scrolling | |
6691 ************************************************************************/ | |
6692 | |
6693 static int hscroll_window_tree P_ ((Lisp_Object)); | |
6694 static int hscroll_windows P_ ((Lisp_Object)); | |
6695 | |
6696 /* For all leaf windows in the window tree rooted at WINDOW, set their | |
6697 hscroll value so that PT is (i) visible in the window, and (ii) so | |
6698 that it is not within a certain margin at the window's left and | |
6699 right border. Value is non-zero if any window's hscroll has been | |
6700 changed. */ | |
6701 | |
6702 static int | |
6703 hscroll_window_tree (window) | |
6704 Lisp_Object window; | |
6705 { | |
6706 int hscrolled_p = 0; | |
6707 | |
6708 while (WINDOWP (window)) | |
6709 { | |
6710 struct window *w = XWINDOW (window); | |
6711 | |
6712 if (WINDOWP (w->hchild)) | |
6713 hscrolled_p |= hscroll_window_tree (w->hchild); | |
6714 else if (WINDOWP (w->vchild)) | |
6715 hscrolled_p |= hscroll_window_tree (w->vchild); | |
6716 else if (w->cursor.vpos >= 0) | |
6717 { | |
6718 int hscroll_margin, text_area_x, text_area_y; | |
6719 int text_area_width, text_area_height; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6720 struct glyph_row *current_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6721 = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6722 struct glyph_row *desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6723 = MATRIX_ROW (w->desired_matrix, w->cursor.vpos); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6724 struct glyph_row *cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6725 = (desired_cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6726 ? desired_cursor_row |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6727 : current_cursor_row); |
25012 | 6728 |
6729 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, | |
6730 &text_area_width, &text_area_height); | |
6731 | |
6732 /* Scroll when cursor is inside this scroll margin. */ | |
6733 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame)); | |
6734 | |
6735 if ((XFASTINT (w->hscroll) | |
6736 && w->cursor.x < hscroll_margin) | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6737 || (cursor_row->enabled_p |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
6738 && cursor_row->truncated_on_right_p |
25012 | 6739 && (w->cursor.x > text_area_width - hscroll_margin))) |
6740 { | |
6741 struct it it; | |
6742 int hscroll; | |
6743 struct buffer *saved_current_buffer; | |
6744 int pt; | |
6745 | |
6746 /* Find point in a display of infinite width. */ | |
6747 saved_current_buffer = current_buffer; | |
6748 current_buffer = XBUFFER (w->buffer); | |
6749 | |
6750 if (w == XWINDOW (selected_window)) | |
6751 pt = BUF_PT (current_buffer); | |
6752 else | |
6753 { | |
6754 pt = marker_position (w->pointm); | |
6755 pt = max (BEGV, pt); | |
6756 pt = min (ZV, pt); | |
6757 } | |
6758 | |
6759 /* Move iterator to pt starting at cursor_row->start in | |
6760 a line with infinite width. */ | |
6761 init_to_row_start (&it, w, cursor_row); | |
6762 it.last_visible_x = INFINITY; | |
6763 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS); | |
6764 current_buffer = saved_current_buffer; | |
6765 | |
6766 /* Center cursor in window. */ | |
6767 hscroll = (max (0, it.current_x - text_area_width / 2) | |
6768 / CANON_X_UNIT (it.f)); | |
6769 | |
6770 /* Don't call Fset_window_hscroll if value hasn't | |
6771 changed because it will prevent redisplay | |
6772 optimizations. */ | |
6773 if (XFASTINT (w->hscroll) != hscroll) | |
6774 { | |
6775 Fset_window_hscroll (window, make_number (hscroll)); | |
6776 hscrolled_p = 1; | |
6777 } | |
6778 } | |
6779 } | |
6780 | |
6781 window = w->next; | |
6782 } | |
6783 | |
6784 /* Value is non-zero if hscroll of any leaf window has been changed. */ | |
6785 return hscrolled_p; | |
6786 } | |
6787 | |
6788 | |
6789 /* Set hscroll so that cursor is visible and not inside horizontal | |
6790 scroll margins for all windows in the tree rooted at WINDOW. See | |
6791 also hscroll_window_tree above. Value is non-zero if any window's | |
6792 hscroll has been changed. If it has, desired matrices on the frame | |
6793 of WINDOW are cleared. */ | |
6794 | |
6795 static int | |
6796 hscroll_windows (window) | |
6797 Lisp_Object window; | |
6798 { | |
6799 int hscrolled_p = hscroll_window_tree (window); | |
6800 if (hscrolled_p) | |
6801 clear_desired_matrices (XFRAME (WINDOW_FRAME (XWINDOW (window)))); | |
6802 return hscrolled_p; | |
6803 } | |
6804 | |
6805 | |
6806 | |
6807 /************************************************************************ | |
6808 Redisplay | |
6809 ************************************************************************/ | |
6810 | |
6811 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined | |
6812 to a non-zero value. This is sometimes handy to have in a debugger | |
6813 session. */ | |
6814 | |
6815 #if GLYPH_DEBUG | |
6816 | |
6817 /* First and last unchanged row for try_window_id. */ | |
6818 | |
6819 int debug_first_unchanged_at_end_vpos; | |
6820 int debug_last_unchanged_at_beg_vpos; | |
6821 | |
6822 /* Delta vpos and y. */ | |
6823 | |
6824 int debug_dvpos, debug_dy; | |
6825 | |
6826 /* Delta in characters and bytes for try_window_id. */ | |
6827 | |
6828 int debug_delta, debug_delta_bytes; | |
6829 | |
6830 /* Values of window_end_pos and window_end_vpos at the end of | |
6831 try_window_id. */ | |
6832 | |
6833 int debug_end_pos, debug_end_vpos; | |
6834 | |
6835 /* Append a string to W->desired_matrix->method. FMT is a printf | |
6836 format string. A1...A9 are a supplement for a variable-length | |
6837 argument list. If trace_redisplay_p is non-zero also printf the | |
6838 resulting string to stderr. */ | |
6839 | |
6840 static void | |
6841 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9) | |
6842 struct window *w; | |
6843 char *fmt; | |
6844 int a1, a2, a3, a4, a5, a6, a7, a8, a9; | |
6845 { | |
6846 char buffer[512]; | |
6847 char *method = w->desired_matrix->method; | |
6848 int len = strlen (method); | |
6849 int size = sizeof w->desired_matrix->method; | |
6850 int remaining = size - len - 1; | |
6851 | |
6852 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9); | |
6853 if (len && remaining) | |
6854 { | |
6855 method[len] = '|'; | |
6856 --remaining, ++len; | |
6857 } | |
6858 | |
6859 strncpy (method + len, buffer, remaining); | |
6860 | |
6861 if (trace_redisplay_p) | |
6862 fprintf (stderr, "%p (%s): %s\n", | |
6863 w, | |
6864 ((BUFFERP (w->buffer) | |
6865 && STRINGP (XBUFFER (w->buffer)->name)) | |
6866 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data | |
6867 : "no buffer"), | |
6868 buffer); | |
6869 } | |
6870 | |
6871 #endif /* GLYPH_DEBUG */ | |
6872 | |
6873 | |
6874 /* This counter is used to clear the face cache every once in a while | |
6875 in redisplay_internal. It is incremented for each redisplay. | |
6876 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is | |
6877 cleared. */ | |
6878 | |
6879 #define CLEAR_FACE_CACHE_COUNT 10000 | |
6880 static int clear_face_cache_count; | |
6881 | |
6882 /* Record the previous terminal frame we displayed. */ | |
6883 | |
6884 static struct frame *previous_terminal_frame; | |
6885 | |
6886 /* Non-zero while redisplay_internal is in progress. */ | |
6887 | |
6888 int redisplaying_p; | |
6889 | |
6890 | |
6891 /* Value is non-zero if all changes in window W, which displays | |
6892 current_buffer, are in the text between START and END. START is a | |
6893 buffer position, END is given as a distance from Z. Used in | |
6894 redisplay_internal for display optimization. */ | |
6895 | |
6896 static INLINE int | |
6897 text_outside_line_unchanged_p (w, start, end) | |
6898 struct window *w; | |
6899 int start, end; | |
6900 { | |
6901 int unchanged_p = 1; | |
6902 | |
6903 /* If text or overlays have changed, see where. */ | |
6904 if (XFASTINT (w->last_modified) < MODIFF | |
6905 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) | |
6906 { | |
6907 /* Gap in the line? */ | |
6908 if (GPT < start || Z - GPT < end) | |
6909 unchanged_p = 0; | |
6910 | |
6911 /* Changes start in front of the line, or end after it? */ | |
6912 if (unchanged_p | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6913 && (BEG_UNCHANGED < start - 1 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6914 || END_UNCHANGED < end)) |
25012 | 6915 unchanged_p = 0; |
6916 | |
6917 /* If selective display, can't optimize if changes start at the | |
6918 beginning of the line. */ | |
6919 if (unchanged_p | |
6920 && INTEGERP (current_buffer->selective_display) | |
6921 && XINT (current_buffer->selective_display) > 0 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6922 && (BEG_UNCHANGED < start || GPT <= start)) |
25012 | 6923 unchanged_p = 0; |
6924 } | |
6925 | |
6926 return unchanged_p; | |
6927 } | |
6928 | |
6929 | |
6930 /* Do a frame update, taking possible shortcuts into account. This is | |
6931 the main external entry point for redisplay. | |
6932 | |
6933 If the last redisplay displayed an echo area message and that message | |
6934 is no longer requested, we clear the echo area or bring back the | |
6935 mini-buffer if that is in use. */ | |
6936 | |
6937 void | |
6938 redisplay () | |
6939 { | |
6940 redisplay_internal (0); | |
6941 } | |
6942 | |
6943 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6944 /* Reconsider the setting of B->clip_changed which is displayed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6945 in window W. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6946 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6947 static INLINE void |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6948 reconsider_clip_changes (w, b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6949 struct window *w; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6950 struct buffer *b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6951 { |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6952 if (b->prevent_redisplay_optimizations_p) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6953 b->clip_changed = 1; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6954 else if (b->clip_changed |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6955 && !NILP (w->window_end_valid) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6956 && w->current_matrix->buffer == b |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6957 && w->current_matrix->zv == BUF_ZV (b) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6958 && w->current_matrix->begv == BUF_BEGV (b)) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6959 b->clip_changed = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6960 } |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6961 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
6962 |
25012 | 6963 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in |
6964 response to any user action; therefore, we should preserve the echo | |
6965 area. (Actually, our caller does that job.) Perhaps in the future | |
6966 avoid recentering windows if it is not necessary; currently that | |
6967 causes some problems. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
6968 |
277 | 6969 static void |
25012 | 6970 redisplay_internal (preserve_echo_area) |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
6971 int preserve_echo_area; |
277 | 6972 { |
25012 | 6973 struct window *w = XWINDOW (selected_window); |
6974 struct frame *f = XFRAME (w->frame); | |
6975 int pause; | |
6976 int must_finish = 0; | |
6977 struct text_pos tlbufpos, tlendpos; | |
6978 int number_of_visible_frames; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
6979 int count; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
6980 struct frame *sf = SELECTED_FRAME (); |
25012 | 6981 |
6982 /* Non-zero means redisplay has to consider all windows on all | |
6983 frames. Zero means, only selected_window is considered. */ | |
6984 int consider_all_windows_p; | |
6985 | |
6986 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p)); | |
6987 | |
6988 /* No redisplay if running in batch mode or frame is not yet fully | |
6989 initialized, or redisplay is explicitly turned off by setting | |
6990 Vinhibit_redisplay. */ | |
6991 if (noninteractive | |
6992 || !NILP (Vinhibit_redisplay) | |
6993 || !f->glyphs_initialized_p) | |
6994 return; | |
6995 | |
6996 /* The flag redisplay_performed_directly_p is set by | |
6997 direct_output_for_insert when it already did the whole screen | |
6998 update necessary. */ | |
6999 if (redisplay_performed_directly_p) | |
7000 { | |
7001 redisplay_performed_directly_p = 0; | |
7002 if (!hscroll_windows (selected_window)) | |
7003 return; | |
7004 } | |
7005 | |
7006 #ifdef USE_X_TOOLKIT | |
7007 if (popup_activated ()) | |
7008 return; | |
7009 #endif | |
7010 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7011 /* I don't think this happens but let's be paranoid. */ |
25012 | 7012 if (redisplaying_p) |
7013 return; | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7014 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7015 /* Record a function that resets redisplaying_p to its old value |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7016 when we leave this function. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7017 count = specpdl_ptr - specpdl; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7018 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); |
25012 | 7019 ++redisplaying_p; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7020 |
25012 | 7021 retry: |
7022 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7023 reconsider_clip_changes (w, current_buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7024 |
25012 | 7025 /* If new fonts have been loaded that make a glyph matrix adjustment |
7026 necessary, do it. */ | |
7027 if (fonts_changed_p) | |
7028 { | |
7029 adjust_glyphs (NULL); | |
7030 ++windows_or_buffers_changed; | |
7031 fonts_changed_p = 0; | |
7032 } | |
7033 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7034 if (! FRAME_WINDOW_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7035 && previous_terminal_frame != sf) |
25012 | 7036 { |
7037 /* Since frames on an ASCII terminal share the same display | |
7038 area, displaying a different frame means redisplay the whole | |
7039 thing. */ | |
7040 windows_or_buffers_changed++; | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7041 SET_FRAME_GARBAGED (sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7042 XSETFRAME (Vterminal_frame, sf); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7043 } |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7044 previous_terminal_frame = sf; |
25012 | 7045 |
7046 /* Set the visible flags for all frames. Do this before checking | |
7047 for resized or garbaged frames; they want to know if their frames | |
7048 are visible. See the comment in frame.h for | |
7049 FRAME_SAMPLE_VISIBILITY. */ | |
7050 { | |
7051 Lisp_Object tail, frame; | |
7052 | |
7053 number_of_visible_frames = 0; | |
7054 | |
7055 FOR_EACH_FRAME (tail, frame) | |
7056 { | |
7057 struct frame *f = XFRAME (frame); | |
7058 | |
7059 FRAME_SAMPLE_VISIBILITY (f); | |
7060 if (FRAME_VISIBLE_P (f)) | |
7061 ++number_of_visible_frames; | |
7062 clear_desired_matrices (f); | |
7063 } | |
7064 } | |
7065 | |
7066 /* Notice any pending interrupt request to change frame size. */ | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7067 do_pending_window_change (1); |
25012 | 7068 |
7069 /* Clear frames marked as garbaged. */ | |
7070 if (frame_garbaged) | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7071 clear_garbaged_frames (); |
25012 | 7072 |
25543 | 7073 /* Build menubar and tool-bar items. */ |
25012 | 7074 prepare_menu_bars (); |
7075 | |
7076 if (windows_or_buffers_changed) | |
7077 update_mode_lines++; | |
7078 | |
7079 /* Detect case that we need to write or remove a star in the mode line. */ | |
7080 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star)) | |
7081 { | |
7082 w->update_mode_line = Qt; | |
7083 if (buffer_shared > 1) | |
7084 update_mode_lines++; | |
7085 } | |
7086 | |
7087 /* If %c is in the mode line, update it if needed. */ | |
7088 if (!NILP (w->column_number_displayed) | |
7089 /* This alternative quickly identifies a common case | |
7090 where no change is needed. */ | |
7091 && !(PT == XFASTINT (w->last_point) | |
7092 && XFASTINT (w->last_modified) >= MODIFF | |
7093 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) | |
7094 && XFASTINT (w->column_number_displayed) != current_column ()) | |
7095 w->update_mode_line = Qt; | |
7096 | |
7097 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; | |
7098 | |
7099 /* The variable buffer_shared is set in redisplay_window and | |
7100 indicates that we redisplay a buffer in different windows. See | |
7101 there. */ | |
7102 consider_all_windows_p = update_mode_lines || buffer_shared > 1; | |
7103 | |
7104 /* If specs for an arrow have changed, do thorough redisplay | |
7105 to ensure we remove any arrow that should no longer exist. */ | |
7106 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position) | |
7107 || ! EQ (Voverlay_arrow_string, last_arrow_string)) | |
7108 consider_all_windows_p = windows_or_buffers_changed = 1; | |
7109 | |
7110 /* Normally the message* functions will have already displayed and | |
7111 updated the echo area, but the frame may have been trashed, or | |
7112 the update may have been preempted, so display the echo area | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7113 again here. Checking both message buffers captures the case that |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7114 the echo area should be cleared. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7115 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7116 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7117 int window_height_changed_p = echo_area_display (0); |
25012 | 7118 must_finish = 1; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7119 |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7120 if (fonts_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7121 goto retry; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7122 else if (window_height_changed_p) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7123 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7124 consider_all_windows_p = 1; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7125 ++update_mode_lines; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7126 ++windows_or_buffers_changed; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7127 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7128 /* If window configuration was changed, frames may have been |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7129 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7130 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7131 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7132 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7133 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7134 } |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7135 else if (w == XWINDOW (minibuf_window) |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7136 && (current_buffer->clip_changed |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7137 || XFASTINT (w->last_modified) < MODIFF |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7138 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7139 && resize_mini_window (w, 0)) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7140 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7141 /* Resized active mini-window to fit the size of what it is |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7142 showing if its contents might have changed. */ |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7143 must_finish = 1; |
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7144 consider_all_windows_p = 1; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7145 ++windows_or_buffers_changed; |
25362
4b8bf7aa0497
(resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents:
25358
diff
changeset
|
7146 ++update_mode_lines; |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7147 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7148 /* If window configuration was changed, frames may have been |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7149 marked garbaged. Clear them or we will experience |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7150 surprises wrt scrolling. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7151 if (frame_garbaged) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7152 clear_garbaged_frames (); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7153 } |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7154 |
25012 | 7155 |
7156 /* If showing the region, and mark has changed, we must redisplay | |
7157 the whole window. The assignment to this_line_start_pos prevents | |
7158 the optimization directly below this if-statement. */ | |
7159 if (((!NILP (Vtransient_mark_mode) | |
7160 && !NILP (XBUFFER (w->buffer)->mark_active)) | |
7161 != !NILP (w->region_showing)) | |
7162 || (!NILP (w->region_showing) | |
7163 && !EQ (w->region_showing, | |
7164 Fmarker_position (XBUFFER (w->buffer)->mark)))) | |
7165 CHARPOS (this_line_start_pos) = 0; | |
7166 | |
7167 /* Optimize the case that only the line containing the cursor in the | |
7168 selected window has changed. Variables starting with this_ are | |
7169 set in display_line and record information about the line | |
7170 containing the cursor. */ | |
7171 tlbufpos = this_line_start_pos; | |
7172 tlendpos = this_line_end_pos; | |
7173 if (!consider_all_windows_p | |
7174 && CHARPOS (tlbufpos) > 0 | |
7175 && NILP (w->update_mode_line) | |
7176 && !current_buffer->clip_changed | |
7177 && FRAME_VISIBLE_P (XFRAME (w->frame)) | |
7178 && !FRAME_OBSCURED_P (XFRAME (w->frame)) | |
7179 /* Make sure recorded data applies to current buffer, etc. */ | |
7180 && this_line_buffer == current_buffer | |
7181 && current_buffer == XBUFFER (w->buffer) | |
7182 && NILP (w->force_start) | |
7183 /* Point must be on the line that we have info recorded about. */ | |
7184 && PT >= CHARPOS (tlbufpos) | |
7185 && PT <= Z - CHARPOS (tlendpos) | |
7186 /* All text outside that line, including its final newline, | |
7187 must be unchanged */ | |
7188 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos), | |
7189 CHARPOS (tlendpos))) | |
7190 { | |
7191 if (CHARPOS (tlbufpos) > BEGV | |
7192 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n' | |
7193 && (CHARPOS (tlbufpos) == ZV | |
7194 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n')) | |
7195 /* Former continuation line has disappeared by becoming empty */ | |
7196 goto cancel; | |
7197 else if (XFASTINT (w->last_modified) < MODIFF | |
7198 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF | |
7199 || MINI_WINDOW_P (w)) | |
7200 { | |
7201 /* We have to handle the case of continuation around a | |
7202 wide-column character (See the comment in indent.c around | |
7203 line 885). | |
7204 | |
7205 For instance, in the following case: | |
7206 | |
7207 -------- Insert -------- | |
7208 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars. | |
7209 J_I_ ==> J_I_ `^^' are cursors. | |
7210 ^^ ^^ | |
7211 -------- -------- | |
7212 | |
7213 As we have to redraw the line above, we should goto cancel. */ | |
7214 | |
7215 struct it it; | |
7216 int line_height_before = this_line_pixel_height; | |
7217 | |
7218 /* Note that start_display will handle the case that the | |
7219 line starting at tlbufpos is a continuation lines. */ | |
7220 start_display (&it, w, tlbufpos); | |
7221 | |
7222 /* Implementation note: It this still necessary? */ | |
7223 if (it.current_x != this_line_start_x) | |
7224 goto cancel; | |
7225 | |
7226 TRACE ((stderr, "trying display optimization 1\n")); | |
7227 w->cursor.vpos = -1; | |
7228 overlay_arrow_seen = 0; | |
7229 it.vpos = this_line_vpos; | |
7230 it.current_y = this_line_y; | |
7231 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos); | |
7232 display_line (&it); | |
7233 | |
7234 /* If line contains point, is not continued, | |
7235 and ends at same distance from eob as before, we win */ | |
7236 if (w->cursor.vpos >= 0 | |
7237 /* Line is not continued, otherwise this_line_start_pos | |
7238 would have been set to 0 in display_line. */ | |
7239 && CHARPOS (this_line_start_pos) | |
7240 /* Line ends as before. */ | |
7241 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos) | |
7242 /* Line has same height as before. Otherwise other lines | |
7243 would have to be shifted up or down. */ | |
7244 && this_line_pixel_height == line_height_before) | |
7245 { | |
7246 /* If this is not the window's last line, we must adjust | |
7247 the charstarts of the lines below. */ | |
7248 if (it.current_y < it.last_visible_y) | |
7249 { | |
7250 struct glyph_row *row | |
7251 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); | |
7252 int delta, delta_bytes; | |
7253 | |
7254 if (Z - CHARPOS (tlendpos) == ZV) | |
7255 { | |
7256 /* This line ends at end of (accessible part of) | |
7257 buffer. There is no newline to count. */ | |
7258 delta = (Z | |
7259 - CHARPOS (tlendpos) | |
7260 - MATRIX_ROW_START_CHARPOS (row)); | |
7261 delta_bytes = (Z_BYTE | |
7262 - BYTEPOS (tlendpos) | |
7263 - MATRIX_ROW_START_BYTEPOS (row)); | |
7264 } | |
7265 else | |
7266 { | |
7267 /* This line ends in a newline. Must take | |
7268 account of the newline and the rest of the | |
7269 text that follows. */ | |
7270 delta = (Z | |
7271 - CHARPOS (tlendpos) | |
7272 - MATRIX_ROW_START_CHARPOS (row)); | |
7273 delta_bytes = (Z_BYTE | |
7274 - BYTEPOS (tlendpos) | |
7275 - MATRIX_ROW_START_BYTEPOS (row)); | |
7276 } | |
7277 | |
7278 increment_glyph_matrix_buffer_positions (w->current_matrix, | |
7279 this_line_vpos + 1, | |
7280 w->current_matrix->nrows, | |
7281 delta, delta_bytes); | |
7282 } | |
7283 | |
7284 /* If this row displays text now but previously didn't, | |
7285 or vice versa, w->window_end_vpos may have to be | |
7286 adjusted. */ | |
7287 if ((it.glyph_row - 1)->displays_text_p) | |
7288 { | |
7289 if (XFASTINT (w->window_end_vpos) < this_line_vpos) | |
7290 XSETINT (w->window_end_vpos, this_line_vpos); | |
7291 } | |
7292 else if (XFASTINT (w->window_end_vpos) == this_line_vpos | |
7293 && this_line_vpos > 0) | |
7294 XSETINT (w->window_end_vpos, this_line_vpos - 1); | |
7295 w->window_end_valid = Qnil; | |
7296 | |
7297 /* Update hint: No need to try to scroll in update_window. */ | |
7298 w->desired_matrix->no_scrolling_p = 1; | |
7299 | |
7300 #if GLYPH_DEBUG | |
7301 *w->desired_matrix->method = 0; | |
7302 debug_method_add (w, "optimization 1"); | |
7303 #endif | |
7304 goto update; | |
7305 } | |
7306 else | |
7307 goto cancel; | |
7308 } | |
7309 else if (/* Cursor position hasn't changed. */ | |
7310 PT == XFASTINT (w->last_point) | |
7311 /* Make sure the cursor was last displayed | |
7312 in this window. Otherwise we have to reposition it. */ | |
7313 && 0 <= w->cursor.vpos | |
7314 && XINT (w->height) > w->cursor.vpos) | |
7315 { | |
7316 if (!must_finish) | |
7317 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7318 do_pending_window_change (1); |
25012 | 7319 |
7320 /* We used to always goto end_of_redisplay here, but this | |
7321 isn't enough if we have a blinking cursor. */ | |
7322 if (w->cursor_off_p == w->last_cursor_off_p) | |
7323 goto end_of_redisplay; | |
7324 } | |
7325 goto update; | |
7326 } | |
7327 /* If highlighting the region, or if the cursor is in the echo area, | |
7328 then we can't just move the cursor. */ | |
7329 else if (! (!NILP (Vtransient_mark_mode) | |
7330 && !NILP (current_buffer->mark_active)) | |
7331 && (w == XWINDOW (current_buffer->last_selected_window) | |
7332 || highlight_nonselected_windows) | |
7333 && NILP (w->region_showing) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
7334 && NILP (Vshow_trailing_whitespace) |
25012 | 7335 && !cursor_in_echo_area) |
7336 { | |
7337 struct it it; | |
7338 struct glyph_row *row; | |
7339 | |
7340 /* Skip from tlbufpos to PT and see where it is. Note that | |
7341 PT may be in invisible text. If so, we will end at the | |
7342 next visible position. */ | |
7343 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos), | |
7344 NULL, DEFAULT_FACE_ID); | |
7345 it.current_x = this_line_start_x; | |
7346 it.current_y = this_line_y; | |
7347 it.vpos = this_line_vpos; | |
7348 | |
7349 /* The call to move_it_to stops in front of PT, but | |
7350 moves over before-strings. */ | |
7351 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | |
7352 | |
7353 if (it.vpos == this_line_vpos | |
7354 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos), | |
7355 row->enabled_p)) | |
7356 { | |
7357 xassert (this_line_vpos == it.vpos); | |
7358 xassert (this_line_y == it.current_y); | |
7359 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
7360 goto update; | |
7361 } | |
7362 else | |
7363 goto cancel; | |
7364 } | |
7365 | |
7366 cancel: | |
7367 /* Text changed drastically or point moved off of line. */ | |
7368 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0); | |
7369 } | |
7370 | |
7371 CHARPOS (this_line_start_pos) = 0; | |
7372 consider_all_windows_p |= buffer_shared > 1; | |
7373 ++clear_face_cache_count; | |
7374 | |
7375 | |
7376 /* Build desired matrices. If consider_all_windows_p is non-zero, | |
7377 do it for all windows on all frames. Otherwise do it for | |
7378 selected_window, only. */ | |
7379 | |
7380 if (consider_all_windows_p) | |
7381 { | |
7382 Lisp_Object tail, frame; | |
7383 | |
7384 /* Clear the face cache eventually. */ | |
7385 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT) | |
7386 { | |
7387 clear_face_cache (0); | |
7388 clear_face_cache_count = 0; | |
7389 } | |
7390 | |
7391 /* Recompute # windows showing selected buffer. This will be | |
7392 incremented each time such a window is displayed. */ | |
7393 buffer_shared = 0; | |
7394 | |
7395 FOR_EACH_FRAME (tail, frame) | |
7396 { | |
7397 struct frame *f = XFRAME (frame); | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7398 if (FRAME_WINDOW_P (f) || f == sf) |
25012 | 7399 { |
7400 /* Mark all the scroll bars to be removed; we'll redeem | |
7401 the ones we want when we redisplay their windows. */ | |
7402 if (condemn_scroll_bars_hook) | |
7403 (*condemn_scroll_bars_hook) (f); | |
7404 | |
7405 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) | |
7406 redisplay_windows (FRAME_ROOT_WINDOW (f)); | |
7407 | |
7408 /* Any scroll bars which redisplay_windows should have | |
7409 nuked should now go away. */ | |
7410 if (judge_scroll_bars_hook) | |
7411 (*judge_scroll_bars_hook) (f); | |
7412 } | |
7413 } | |
7414 } | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7415 else if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7416 && !FRAME_OBSCURED_P (sf)) |
25012 | 7417 redisplay_window (selected_window, 1); |
7418 | |
7419 | |
7420 /* Compare desired and current matrices, perform output. */ | |
7421 | |
7422 update: | |
7423 | |
7424 /* If fonts changed, display again. */ | |
7425 if (fonts_changed_p) | |
7426 goto retry; | |
7427 | |
7428 /* Prevent various kinds of signals during display update. | |
7429 stdio is not robust about handling signals, | |
7430 which can cause an apparent I/O error. */ | |
7431 if (interrupt_input) | |
7432 unrequest_sigio (); | |
7433 stop_polling (); | |
7434 | |
7435 if (consider_all_windows_p) | |
7436 { | |
7437 Lisp_Object tail; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7438 struct frame *f; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7439 int hscrolled_p; |
25012 | 7440 |
7441 pause = 0; | |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7442 hscrolled_p = 0; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7443 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7444 /* See if we have to hscroll. */ |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7445 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7446 if (FRAMEP (XCAR (tail))) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7447 { |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7448 f = XFRAME (XCAR (tail)); |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7449 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7450 if ((FRAME_WINDOW_P (f) |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7451 || f == sf) |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7452 && FRAME_VISIBLE_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7453 && !FRAME_OBSCURED_P (f) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7454 && hscroll_windows (f->root_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7455 hscrolled_p = 1; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7456 } |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7457 |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7458 if (hscrolled_p) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7459 goto retry; |
25012 | 7460 |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7461 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
25012 | 7462 { |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7463 if (!FRAMEP (XCAR (tail))) |
25012 | 7464 continue; |
7465 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
7466 f = XFRAME (XCAR (tail)); |
25012 | 7467 |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7468 if ((FRAME_WINDOW_P (f) || f == sf) |
25012 | 7469 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) |
7470 { | |
7471 /* Mark all windows as to be updated. */ | |
7472 set_window_update_flags (XWINDOW (f->root_window), 1); | |
7473 pause |= update_frame (f, 0, 0); | |
7474 if (!pause) | |
7475 { | |
7476 mark_window_display_accurate (f->root_window, 1); | |
7477 if (frame_up_to_date_hook != 0) | |
7478 (*frame_up_to_date_hook) (f); | |
7479 } | |
7480 } | |
7481 } | |
7482 } | |
7483 else | |
7484 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7485 if (FRAME_VISIBLE_P (sf) |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7486 && !FRAME_OBSCURED_P (sf)) |
25012 | 7487 { |
25660
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7488 if (hscroll_windows (selected_window)) |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7489 goto retry; |
0072098f54df
(resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents:
25643
diff
changeset
|
7490 |
25012 | 7491 XWINDOW (selected_window)->must_be_updated_p = 1; |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7492 pause = update_frame (sf, 0, 0); |
25012 | 7493 } |
7494 else | |
7495 pause = 0; | |
7496 | |
7497 /* We may have called echo_area_display at the top of this | |
7498 function. If the echo area is on another frame, that may | |
7499 have put text on a frame other than the selected one, so the | |
7500 above call to update_frame would not have caught it. Catch | |
7501 it here. */ | |
7502 { | |
7503 Lisp_Object mini_window; | |
7504 struct frame *mini_frame; | |
7505 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7506 mini_window = FRAME_MINIBUF_WINDOW (sf); |
25012 | 7507 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window))); |
7508 | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7509 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame)) |
25012 | 7510 { |
7511 XWINDOW (mini_window)->must_be_updated_p = 1; | |
7512 pause |= update_frame (mini_frame, 0, 0); | |
7513 if (!pause && hscroll_windows (mini_window)) | |
7514 goto retry; | |
7515 } | |
7516 } | |
7517 } | |
7518 | |
7519 /* If display was paused because of pending input, make sure we do a | |
7520 thorough update the next time. */ | |
7521 if (pause) | |
7522 { | |
7523 /* Prevent the optimization at the beginning of | |
7524 redisplay_internal that tries a single-line update of the | |
7525 line containing the cursor in the selected window. */ | |
7526 CHARPOS (this_line_start_pos) = 0; | |
7527 | |
7528 /* Let the overlay arrow be updated the next time. */ | |
7529 if (!NILP (last_arrow_position)) | |
7530 { | |
7531 last_arrow_position = Qt; | |
7532 last_arrow_string = Qt; | |
7533 } | |
7534 | |
7535 /* If we pause after scrolling, some rows in the current | |
7536 matrices of some windows are not valid. */ | |
7537 if (!WINDOW_FULL_WIDTH_P (w) | |
7538 && !FRAME_WINDOW_P (XFRAME (w->frame))) | |
7539 update_mode_lines = 1; | |
7540 } | |
7541 | |
7542 /* Now text on frame agrees with windows, so put info into the | |
7543 windows for partial redisplay to follow. */ | |
7544 if (!pause) | |
7545 { | |
7546 register struct buffer *b = XBUFFER (w->buffer); | |
7547 | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7548 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7549 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = BUF_OVERLAY_MODIFF (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7550 BUF_BEG_UNCHANGED (b) = BUF_GPT (b) - BUF_BEG (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7551 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b); |
25012 | 7552 |
7553 if (consider_all_windows_p) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7554 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1); |
25012 | 7555 else |
7556 { | |
7557 XSETFASTINT (w->last_point, BUF_PT (b)); | |
7558 w->last_cursor = w->cursor; | |
7559 w->last_cursor_off_p = w->cursor_off_p; | |
7560 | |
7561 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7562 b->prevent_redisplay_optimizations_p = 0; |
25012 | 7563 w->update_mode_line = Qnil; |
7564 XSETFASTINT (w->last_modified, BUF_MODIFF (b)); | |
7565 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b)); | |
7566 w->last_had_star | |
7567 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | |
7568 ? Qt : Qnil); | |
7569 | |
7570 /* Record if we are showing a region, so can make sure to | |
7571 update it fully at next redisplay. */ | |
7572 w->region_showing = (!NILP (Vtransient_mark_mode) | |
7573 && (w == XWINDOW (current_buffer->last_selected_window) | |
7574 || highlight_nonselected_windows) | |
7575 && !NILP (XBUFFER (w->buffer)->mark_active) | |
7576 ? Fmarker_position (XBUFFER (w->buffer)->mark) | |
7577 : Qnil); | |
7578 | |
7579 w->window_end_valid = w->buffer; | |
7580 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
7581 last_arrow_string = Voverlay_arrow_string; | |
7582 if (frame_up_to_date_hook != 0) | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
7583 (*frame_up_to_date_hook) (sf); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7584 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7585 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7586 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7587 w->current_matrix->zv = BUF_ZV (b); |
25012 | 7588 } |
7589 | |
7590 update_mode_lines = 0; | |
7591 windows_or_buffers_changed = 0; | |
7592 } | |
7593 | |
7594 /* Start SIGIO interrupts coming again. Having them off during the | |
7595 code above makes it less likely one will discard output, but not | |
7596 impossible, since there might be stuff in the system buffer here. | |
7597 But it is much hairier to try to do anything about that. */ | |
7598 if (interrupt_input) | |
7599 request_sigio (); | |
7600 start_polling (); | |
7601 | |
7602 /* If a frame has become visible which was not before, redisplay | |
7603 again, so that we display it. Expose events for such a frame | |
7604 (which it gets when becoming visible) don't call the parts of | |
7605 redisplay constructing glyphs, so simply exposing a frame won't | |
7606 display anything in this case. So, we have to display these | |
7607 frames here explicitly. */ | |
7608 if (!pause) | |
7609 { | |
7610 Lisp_Object tail, frame; | |
7611 int new_count = 0; | |
7612 | |
7613 FOR_EACH_FRAME (tail, frame) | |
7614 { | |
7615 int this_is_visible = 0; | |
7616 | |
7617 if (XFRAME (frame)->visible) | |
7618 this_is_visible = 1; | |
7619 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); | |
7620 if (XFRAME (frame)->visible) | |
7621 this_is_visible = 1; | |
7622 | |
7623 if (this_is_visible) | |
7624 new_count++; | |
7625 } | |
7626 | |
7627 if (new_count != number_of_visible_frames) | |
7628 windows_or_buffers_changed++; | |
7629 } | |
7630 | |
7631 /* Change frame size now if a change is pending. */ | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7632 do_pending_window_change (1); |
25012 | 7633 |
7634 /* If we just did a pending size change, or have additional | |
7635 visible frames, redisplay again. */ | |
7636 if (windows_or_buffers_changed && !pause) | |
7637 goto retry; | |
7638 | |
7639 end_of_redisplay:; | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7640 |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7641 unbind_to (count, Qnil); |
25012 | 7642 } |
7643 | |
7644 | |
7645 /* Redisplay, but leave alone any recent echo area message unless | |
7646 another message has been requested in its place. | |
7647 | |
7648 This is useful in situations where you need to redisplay but no | |
7649 user action has occurred, making it inappropriate for the message | |
7650 area to be cleared. See tracking_off and | |
7651 wait_reading_process_input for examples of these situations. */ | |
7652 | |
7653 void | |
7654 redisplay_preserve_echo_area () | |
7655 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7656 if (!NILP (echo_area_buffer[1])) |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7657 { |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7658 /* We have a previously displayed message, but no current |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7659 message. Redisplay the previous message. */ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7660 display_last_displayed_message_p = 1; |
25012 | 7661 redisplay_internal (1); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7662 display_last_displayed_message_p = 0; |
25012 | 7663 } |
7664 else | |
7665 redisplay_internal (1); | |
7666 } | |
7667 | |
7668 | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7669 /* Function registered with record_unwind_protect in |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7670 redisplay_internal. Clears the flag indicating that a redisplay is |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7671 in progress. */ |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7672 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7673 static Lisp_Object |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7674 unwind_redisplay (old_redisplaying_p) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7675 Lisp_Object old_redisplaying_p; |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7676 { |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7677 redisplaying_p = XFASTINT (old_redisplaying_p); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
7678 return Qnil; |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7679 } |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7680 |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
7681 |
25012 | 7682 /* Mark the display of windows in the window tree rooted at WINDOW as |
7683 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW | |
7684 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed | |
7685 the next time redisplay_internal is called. */ | |
7686 | |
7687 void | |
7688 mark_window_display_accurate (window, accurate_p) | |
7689 Lisp_Object window; | |
7690 int accurate_p; | |
7691 { | |
7692 struct window *w; | |
7693 | |
7694 for (; !NILP (window); window = w->next) | |
7695 { | |
7696 w = XWINDOW (window); | |
7697 | |
7698 if (BUFFERP (w->buffer)) | |
7699 { | |
7700 struct buffer *b = XBUFFER (w->buffer); | |
7701 | |
7702 XSETFASTINT (w->last_modified, | |
7703 accurate_p ? BUF_MODIFF (b) : 0); | |
7704 XSETFASTINT (w->last_overlay_modified, | |
7705 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0); | |
7706 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b) | |
7707 ? Qt : Qnil); | |
7708 | |
7709 #if 0 /* I don't think this is necessary because display_line does it. | |
7710 Let's check it. */ | |
7711 /* Record if we are showing a region, so can make sure to | |
7712 update it fully at next redisplay. */ | |
7713 w->region_showing | |
7714 = (!NILP (Vtransient_mark_mode) | |
7715 && (w == XWINDOW (current_buffer->last_selected_window) | |
7716 || highlight_nonselected_windows) | |
7717 && (!NILP (b->mark_active) | |
7718 ? Fmarker_position (b->mark) | |
7719 : Qnil)); | |
7720 #endif | |
7721 | |
7722 if (accurate_p) | |
7723 { | |
7724 b->clip_changed = 0; | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7725 b->prevent_redisplay_optimizations_p = 0; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7726 w->current_matrix->buffer = b; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7727 w->current_matrix->begv = BUF_BEGV (b); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
7728 w->current_matrix->zv = BUF_ZV (b); |
25012 | 7729 w->last_cursor = w->cursor; |
7730 w->last_cursor_off_p = w->cursor_off_p; | |
7731 if (w == XWINDOW (selected_window)) | |
7732 w->last_point = BUF_PT (b); | |
7733 else | |
7734 w->last_point = XMARKER (w->pointm)->charpos; | |
7735 } | |
7736 } | |
7737 | |
7738 w->window_end_valid = w->buffer; | |
7739 w->update_mode_line = Qnil; | |
7740 | |
7741 if (!NILP (w->vchild)) | |
7742 mark_window_display_accurate (w->vchild, accurate_p); | |
7743 if (!NILP (w->hchild)) | |
7744 mark_window_display_accurate (w->hchild, accurate_p); | |
7745 } | |
7746 | |
7747 if (accurate_p) | |
7748 { | |
7749 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position); | |
7750 last_arrow_string = Voverlay_arrow_string; | |
7751 } | |
7752 else | |
7753 { | |
7754 /* Force a thorough redisplay the next time by setting | |
7755 last_arrow_position and last_arrow_string to t, which is | |
7756 unequal to any useful value of Voverlay_arrow_... */ | |
7757 last_arrow_position = Qt; | |
7758 last_arrow_string = Qt; | |
7759 } | |
7760 } | |
7761 | |
277 | 7762 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7763 /* Return value in display table DP (Lisp_Char_Table *) for character |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7764 C. Since a display table doesn't have any parent, we don't have to |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7765 follow parent. Do not call this function directly but use the |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7766 macro DISP_CHAR_VECTOR. */ |
25012 | 7767 |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7768 Lisp_Object |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7769 disp_char_vector (dp, c) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7770 struct Lisp_Char_Table *dp; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7771 int c; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7772 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7773 int code[4], i; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7774 Lisp_Object val; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7775 |
25012 | 7776 if (SINGLE_BYTE_CHAR_P (c)) |
7777 return (dp->contents[c]); | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7778 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7779 SPLIT_NON_ASCII_CHAR (c, code[0], code[1], code[2]); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7780 if (code[0] != CHARSET_COMPOSITION) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7781 { |
25012 | 7782 if (code[1] < 32) |
7783 code[1] = -1; | |
7784 else if (code[2] < 32) | |
7785 code[2] = -1; | |
7786 } | |
7787 | |
7788 /* Here, the possible range of code[0] (== charset ID) is | |
7789 128..max_charset. Since the top level char table contains data | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7790 for multibyte characters after 256th element, we must increment |
25012 | 7791 code[0] by 128 to get a correct index. */ |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7792 code[0] += 128; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7793 code[3] = -1; /* anchor */ |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7794 |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7795 for (i = 0; code[i] >= 0; i++, dp = XCHAR_TABLE (val)) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7796 { |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7797 val = dp->contents[code[i]]; |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7798 if (!SUB_CHAR_TABLE_P (val)) |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7799 return (NILP (val) ? dp->defalt : val); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7800 } |
25012 | 7801 |
7802 /* Here, val is a sub char table. We return the default value of | |
7803 it. */ | |
17317
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7804 return (dp->defalt); |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7805 } |
51b7fded4356
(disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents:
17179
diff
changeset
|
7806 |
25012 | 7807 |
7808 | |
7809 /*********************************************************************** | |
7810 Window Redisplay | |
7811 ***********************************************************************/ | |
7812 | |
7813 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */ | |
7814 | |
7815 static void | |
7816 redisplay_windows (window) | |
7817 Lisp_Object window; | |
7818 { | |
7819 while (!NILP (window)) | |
7820 { | |
7821 struct window *w = XWINDOW (window); | |
7822 | |
7823 if (!NILP (w->hchild)) | |
7824 redisplay_windows (w->hchild); | |
7825 else if (!NILP (w->vchild)) | |
7826 redisplay_windows (w->vchild); | |
7827 else | |
7828 redisplay_window (window, 0); | |
7829 | |
7830 window = w->next; | |
7831 } | |
7832 } | |
7833 | |
7834 | |
7835 /* Set cursor position of W. PT is assumed to be displayed in ROW. | |
7836 DELTA is the number of bytes by which positions recorded in ROW | |
7837 differ from current buffer positions. */ | |
7838 | |
7839 void | |
7840 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) | |
7841 struct window *w; | |
7842 struct glyph_row *row; | |
7843 struct glyph_matrix *matrix; | |
7844 int delta, delta_bytes, dy, dvpos; | |
7845 { | |
7846 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
7847 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
7848 int x = row->x; | |
7849 int pt_old = PT - delta; | |
7850 | |
7851 /* Skip over glyphs not having an object at the start of the row. | |
7852 These are special glyphs like truncation marks on terminal | |
7853 frames. */ | |
7854 if (row->displays_text_p) | |
7855 while (glyph < end | |
7856 && !glyph->object | |
7857 && glyph->charpos < 0) | |
7858 { | |
7859 x += glyph->pixel_width; | |
7860 ++glyph; | |
7861 } | |
7862 | |
7863 while (glyph < end | |
7864 && glyph->object | |
7865 && (!BUFFERP (glyph->object) | |
7866 || glyph->charpos < pt_old)) | |
7867 { | |
7868 x += glyph->pixel_width; | |
7869 ++glyph; | |
7870 } | |
7871 | |
7872 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; | |
7873 w->cursor.x = x; | |
7874 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos; | |
7875 w->cursor.y = row->y + dy; | |
7876 | |
7877 if (w == XWINDOW (selected_window)) | |
7878 { | |
7879 if (!row->continued_p | |
7880 && !MATRIX_ROW_CONTINUATION_LINE_P (row) | |
7881 && row->x == 0) | |
7882 { | |
7883 this_line_buffer = XBUFFER (w->buffer); | |
7884 | |
7885 CHARPOS (this_line_start_pos) | |
7886 = MATRIX_ROW_START_CHARPOS (row) + delta; | |
7887 BYTEPOS (this_line_start_pos) | |
7888 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes; | |
7889 | |
7890 CHARPOS (this_line_end_pos) | |
7891 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta); | |
7892 BYTEPOS (this_line_end_pos) | |
7893 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes); | |
7894 | |
7895 this_line_y = w->cursor.y; | |
7896 this_line_pixel_height = row->height; | |
7897 this_line_vpos = w->cursor.vpos; | |
7898 this_line_start_x = row->x; | |
7899 } | |
7900 else | |
7901 CHARPOS (this_line_start_pos) = 0; | |
7902 } | |
7903 } | |
7904 | |
7905 | |
7906 /* Run window scroll functions, if any, for WINDOW with new window | |
25643
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7907 start STARTP. Sets the window start of WINDOW to that position. |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7908 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7909 We assume that the window's buffer is really current. */ |
25012 | 7910 |
7911 static INLINE struct text_pos | |
7912 run_window_scroll_functions (window, startp) | |
7913 Lisp_Object window; | |
7914 struct text_pos startp; | |
7915 { | |
7916 struct window *w = XWINDOW (window); | |
7917 SET_MARKER_FROM_TEXT_POS (w->start, startp); | |
25643
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7918 |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7919 if (current_buffer != XBUFFER (w->buffer)) |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7920 abort (); |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7921 |
25012 | 7922 if (!NILP (Vwindow_scroll_functions)) |
7923 { | |
7924 run_hook_with_args_2 (Qwindow_scroll_functions, window, | |
7925 make_number (CHARPOS (startp))); | |
7926 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
25643
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7927 /* In case the hook functions switch buffers. */ |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7928 if (current_buffer != XBUFFER (w->buffer)) |
385bf7dbf253
(run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents:
25614
diff
changeset
|
7929 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 7930 } |
7931 | |
7932 return startp; | |
7933 } | |
7934 | |
7935 | |
7936 /* Modify the desired matrix of window W and W->vscroll so that the | |
7937 line containing the cursor is fully visible. */ | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
7938 |
277 | 7939 static void |
25012 | 7940 make_cursor_line_fully_visible (w) |
7941 struct window *w; | |
7942 { | |
7943 struct glyph_matrix *matrix; | |
7944 struct glyph_row *row; | |
25546 | 7945 int header_line_height; |
25012 | 7946 |
7947 /* It's not always possible to find the cursor, e.g, when a window | |
7948 is full of overlay strings. Don't do anything in that case. */ | |
7949 if (w->cursor.vpos < 0) | |
7950 return; | |
7951 | |
7952 matrix = w->desired_matrix; | |
7953 row = MATRIX_ROW (matrix, w->cursor.vpos); | |
7954 | |
7955 /* If row->y == top y of window display area, the window isn't tall | |
7956 enough to display a single line. There is nothing we can do | |
7957 about it. */ | |
25546 | 7958 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
7959 if (row->y == header_line_height) | |
25012 | 7960 return; |
7961 | |
7962 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)) | |
7963 { | |
7964 int dy = row->height - row->visible_height; | |
7965 w->vscroll = 0; | |
7966 w->cursor.y += dy; | |
7967 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
7968 } | |
7969 else if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) | |
7970 { | |
7971 int dy = - (row->height - row->visible_height); | |
7972 w->vscroll = dy; | |
7973 w->cursor.y += dy; | |
7974 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy); | |
7975 } | |
7976 | |
7977 /* When we change the cursor y-position of the selected window, | |
7978 change this_line_y as well so that the display optimization for | |
7979 the cursor line of the selected window in redisplay_internal uses | |
7980 the correct y-position. */ | |
7981 if (w == XWINDOW (selected_window)) | |
7982 this_line_y = w->cursor.y; | |
7983 } | |
7984 | |
7985 | |
7986 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P | |
7987 non-zero means only WINDOW is redisplayed in redisplay_internal. | |
7988 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used | |
7989 in redisplay_window to bring a partially visible line into view in | |
7990 the case that only the cursor has moved. | |
7991 | |
7992 Value is | |
7993 | |
7994 1 if scrolling succeeded | |
7995 | |
7996 0 if scrolling didn't find point. | |
7997 | |
7998 -1 if new fonts have been loaded so that we must interrupt | |
7999 redisplay, adjust glyph matrices, and try again. */ | |
8000 | |
8001 static int | |
8002 try_scrolling (window, just_this_one_p, scroll_conservatively, | |
8003 scroll_step, temp_scroll_step) | |
277 | 8004 Lisp_Object window; |
25012 | 8005 int just_this_one_p; |
8006 int scroll_conservatively, scroll_step; | |
8007 int temp_scroll_step; | |
8008 { | |
8009 struct window *w = XWINDOW (window); | |
8010 struct frame *f = XFRAME (w->frame); | |
8011 struct text_pos scroll_margin_pos; | |
8012 struct text_pos pos; | |
8013 struct text_pos startp; | |
8014 struct it it; | |
8015 Lisp_Object window_end; | |
8016 int this_scroll_margin; | |
8017 int dy = 0; | |
8018 int scroll_max; | |
8019 int line_height, rc; | |
8020 int amount_to_scroll = 0; | |
8021 Lisp_Object aggressive; | |
277 | 8022 int height; |
25012 | 8023 |
8024 #if GLYPH_DEBUG | |
8025 debug_method_add (w, "try_scrolling"); | |
8026 #endif | |
8027 | |
8028 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
8029 | |
8030 /* Compute scroll margin height in pixels. We scroll when point is | |
8031 within this distance from the top or bottom of the window. */ | |
8032 if (scroll_margin > 0) | |
8033 { | |
8034 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4); | |
8035 this_scroll_margin *= CANON_Y_UNIT (f); | |
8036 } | |
8037 else | |
8038 this_scroll_margin = 0; | |
8039 | |
8040 /* Compute how much we should try to scroll maximally to bring point | |
8041 into view. */ | |
8042 if (scroll_step) | |
8043 scroll_max = scroll_step; | |
8044 else if (scroll_conservatively) | |
8045 scroll_max = scroll_conservatively; | |
8046 else if (temp_scroll_step) | |
8047 scroll_max = temp_scroll_step; | |
8048 else if (NUMBERP (current_buffer->scroll_down_aggressively) | |
8049 || NUMBERP (current_buffer->scroll_up_aggressively)) | |
8050 /* We're trying to scroll because of aggressive scrolling | |
8051 but no scroll_step is set. Choose an arbitrary one. Maybe | |
8052 there should be a variable for this. */ | |
8053 scroll_max = 10; | |
8054 else | |
8055 scroll_max = 0; | |
8056 scroll_max *= CANON_Y_UNIT (f); | |
8057 | |
8058 /* Decide whether we have to scroll down. Start at the window end | |
8059 and move this_scroll_margin up to find the position of the scroll | |
8060 margin. */ | |
8061 window_end = Fwindow_end (window, Qt); | |
8062 CHARPOS (scroll_margin_pos) = XINT (window_end); | |
8063 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos)); | |
8064 if (this_scroll_margin) | |
8065 { | |
8066 start_display (&it, w, scroll_margin_pos); | |
8067 move_it_vertically (&it, - this_scroll_margin); | |
8068 scroll_margin_pos = it.current.pos; | |
8069 } | |
8070 | |
8071 if (PT >= CHARPOS (scroll_margin_pos)) | |
8072 { | |
8073 int y0; | |
8074 | |
8075 /* Point is in the scroll margin at the bottom of the window, or | |
8076 below. Compute a new window start that makes point visible. */ | |
8077 | |
8078 /* Compute the distance from the scroll margin to PT. | |
8079 Give up if the distance is greater than scroll_max. */ | |
8080 start_display (&it, w, scroll_margin_pos); | |
8081 y0 = it.current_y; | |
8082 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8083 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8084 line_height = (it.max_ascent + it.max_descent | |
8085 ? it.max_ascent + it.max_descent | |
8086 : last_height); | |
8087 dy = it.current_y + line_height - y0; | |
8088 if (dy > scroll_max) | |
8089 return 0; | |
8090 | |
8091 /* Move the window start down. If scrolling conservatively, | |
8092 move it just enough down to make point visible. If | |
8093 scroll_step is set, move it down by scroll_step. */ | |
8094 start_display (&it, w, startp); | |
8095 | |
8096 if (scroll_conservatively) | |
8097 amount_to_scroll = dy; | |
8098 else if (scroll_step || temp_scroll_step) | |
8099 amount_to_scroll = scroll_max; | |
8100 else | |
8101 { | |
8102 aggressive = current_buffer->scroll_down_aggressively; | |
8103 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8104 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8105 if (NUMBERP (aggressive)) |
8106 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8107 } | |
8108 | |
8109 if (amount_to_scroll <= 0) | |
8110 return 0; | |
8111 | |
8112 move_it_vertically (&it, amount_to_scroll); | |
8113 startp = it.current.pos; | |
8114 } | |
8115 else | |
8116 { | |
8117 /* See if point is inside the scroll margin at the top of the | |
8118 window. */ | |
8119 scroll_margin_pos = startp; | |
8120 if (this_scroll_margin) | |
8121 { | |
8122 start_display (&it, w, startp); | |
8123 move_it_vertically (&it, this_scroll_margin); | |
8124 scroll_margin_pos = it.current.pos; | |
8125 } | |
8126 | |
8127 if (PT < CHARPOS (scroll_margin_pos)) | |
8128 { | |
8129 /* Point is in the scroll margin at the top of the window or | |
8130 above what is displayed in the window. */ | |
8131 int y0; | |
8132 | |
8133 /* Compute the vertical distance from PT to the scroll | |
8134 margin position. Give up if distance is greater than | |
8135 scroll_max. */ | |
8136 SET_TEXT_POS (pos, PT, PT_BYTE); | |
8137 start_display (&it, w, pos); | |
8138 y0 = it.current_y; | |
8139 move_it_to (&it, CHARPOS (scroll_margin_pos), 0, | |
8140 it.last_visible_y, -1, | |
8141 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8142 dy = it.current_y - y0; | |
8143 if (dy > scroll_max) | |
8144 return 0; | |
8145 | |
8146 /* Compute new window start. */ | |
8147 start_display (&it, w, startp); | |
8148 | |
8149 if (scroll_conservatively) | |
8150 amount_to_scroll = dy; | |
8151 else if (scroll_step || temp_scroll_step) | |
8152 amount_to_scroll = scroll_max; | |
8153 else | |
8154 { | |
8155 aggressive = current_buffer->scroll_up_aggressively; | |
8156 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w) | |
25546 | 8157 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w)); |
25012 | 8158 if (NUMBERP (aggressive)) |
8159 amount_to_scroll = XFLOATINT (aggressive) * height; | |
8160 } | |
8161 | |
8162 if (amount_to_scroll <= 0) | |
8163 return 0; | |
8164 | |
8165 move_it_vertically (&it, - amount_to_scroll); | |
8166 startp = it.current.pos; | |
8167 } | |
8168 } | |
8169 | |
8170 /* Run window scroll functions. */ | |
8171 startp = run_window_scroll_functions (window, startp); | |
8172 | |
8173 /* Display the window. Give up if new fonts are loaded, or if point | |
8174 doesn't appear. */ | |
8175 if (!try_window (window, startp)) | |
8176 rc = -1; | |
8177 else if (w->cursor.vpos < 0) | |
8178 { | |
8179 clear_glyph_matrix (w->desired_matrix); | |
8180 rc = 0; | |
8181 } | |
8182 else | |
8183 { | |
8184 /* Maybe forget recorded base line for line number display. */ | |
8185 if (!just_this_one_p | |
8186 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8187 || BEG_UNCHANGED < CHARPOS (startp)) |
25012 | 8188 w->base_line_number = Qnil; |
8189 | |
8190 /* If cursor ends up on a partially visible line, shift display | |
8191 lines up or down. */ | |
8192 make_cursor_line_fully_visible (w); | |
8193 rc = 1; | |
8194 } | |
8195 | |
8196 return rc; | |
8197 } | |
8198 | |
8199 | |
8200 /* Compute a suitable window start for window W if display of W starts | |
8201 on a continuation line. Value is non-zero if a new window start | |
8202 was computed. | |
8203 | |
8204 The new window start will be computed, based on W's width, starting | |
8205 from the start of the continued line. It is the start of the | |
8206 screen line with the minimum distance from the old start W->start. */ | |
8207 | |
8208 static int | |
8209 compute_window_start_on_continuation_line (w) | |
8210 struct window *w; | |
8211 { | |
8212 struct text_pos pos, start_pos; | |
8213 int window_start_changed_p = 0; | |
8214 | |
8215 SET_TEXT_POS_FROM_MARKER (start_pos, w->start); | |
8216 | |
8217 /* If window start is on a continuation line... Window start may be | |
8218 < BEGV in case there's invisible text at the start of the | |
8219 buffer (M-x rmail, for example). */ | |
8220 if (CHARPOS (start_pos) > BEGV | |
8221 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n') | |
8222 { | |
8223 struct it it; | |
8224 struct glyph_row *row; | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8225 |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8226 /* Handle the case that the window start is out of range. */ |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8227 if (CHARPOS (start_pos) < BEGV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8228 SET_TEXT_POS (start_pos, BEGV, BEGV_BYTE); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8229 else if (CHARPOS (start_pos) > ZV) |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
8230 SET_TEXT_POS (start_pos, ZV, ZV_BYTE); |
25012 | 8231 |
8232 /* Find the start of the continued line. This should be fast | |
8233 because scan_buffer is fast (newline cache). */ | |
25546 | 8234 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0); |
25012 | 8235 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos), |
8236 row, DEFAULT_FACE_ID); | |
8237 reseat_at_previous_visible_line_start (&it); | |
8238 | |
8239 /* If the line start is "too far" away from the window start, | |
8240 say it takes too much time to compute a new window start. */ | |
8241 if (CHARPOS (start_pos) - IT_CHARPOS (it) | |
8242 < XFASTINT (w->height) * XFASTINT (w->width)) | |
8243 { | |
8244 int min_distance, distance; | |
8245 | |
8246 /* Move forward by display lines to find the new window | |
8247 start. If window width was enlarged, the new start can | |
8248 be expected to be > the old start. If window width was | |
8249 decreased, the new window start will be < the old start. | |
8250 So, we're looking for the display line start with the | |
8251 minimum distance from the old window start. */ | |
8252 pos = it.current.pos; | |
8253 min_distance = INFINITY; | |
8254 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))), | |
8255 distance < min_distance) | |
8256 { | |
8257 min_distance = distance; | |
8258 pos = it.current.pos; | |
8259 move_it_by_lines (&it, 1, 0); | |
8260 } | |
8261 | |
8262 /* Set the window start there. */ | |
8263 SET_MARKER_FROM_TEXT_POS (w->start, pos); | |
8264 window_start_changed_p = 1; | |
8265 } | |
8266 } | |
8267 | |
8268 return window_start_changed_p; | |
8269 } | |
8270 | |
8271 | |
8272 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only | |
8273 selected_window is redisplayed. */ | |
8274 | |
8275 static void | |
8276 redisplay_window (window, just_this_one_p) | |
8277 Lisp_Object window; | |
8278 int just_this_one_p; | |
8279 { | |
8280 struct window *w = XWINDOW (window); | |
8281 struct frame *f = XFRAME (w->frame); | |
8282 struct buffer *buffer = XBUFFER (w->buffer); | |
277 | 8283 struct buffer *old = current_buffer; |
25012 | 8284 struct text_pos lpoint, opoint, startp; |
8285 int update_mode_line; | |
277 | 8286 int tem; |
25012 | 8287 struct it it; |
8288 /* Record it now because it's overwritten. */ | |
8289 int current_matrix_up_to_date_p = 0; | |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8290 int really_switched_buffer = 0; |
25012 | 8291 int temp_scroll_step = 0; |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8292 int count = specpdl_ptr - specpdl; |
277 | 8293 |
25012 | 8294 SET_TEXT_POS (lpoint, PT, PT_BYTE); |
8295 opoint = lpoint; | |
8296 | |
8297 /* W must be a leaf window here. */ | |
8298 xassert (!NILP (w->buffer)); | |
8299 #if GLYPH_DEBUG | |
8300 *w->desired_matrix->method = 0; | |
8301 #endif | |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8302 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
8303 specbind (Qinhibit_point_motion_hooks, Qt); |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8304 |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8305 reconsider_clip_changes (w, buffer); |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8306 |
25012 | 8307 /* Has the mode line to be updated? */ |
8308 update_mode_line = (!NILP (w->update_mode_line) | |
8309 || update_mode_lines | |
8310 || buffer->clip_changed); | |
433 | 8311 |
8312 if (MINI_WINDOW_P (w)) | |
8313 { | |
25012 | 8314 if (w == XWINDOW (echo_area_window) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
8315 && !NILP (echo_area_buffer[0])) |
25012 | 8316 { |
8317 if (update_mode_line) | |
8318 /* We may have to update a tty frame's menu bar or a | |
25543 | 8319 tool-bar. Example `M-x C-h C-h C-g'. */ |
25012 | 8320 goto finish_menu_bars; |
8321 else | |
8322 /* We've already displayed the echo area glyphs in this window. */ | |
8323 goto finish_scroll_bars; | |
8324 } | |
12629
55241c80f448
(echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents:
12598
diff
changeset
|
8325 else if (w != XWINDOW (minibuf_window)) |
433 | 8326 { |
25012 | 8327 /* W is a mini-buffer window, but it's not the currently |
8328 active one, so clear it. */ | |
8329 int yb = window_text_bottom_y (w); | |
8330 struct glyph_row *row; | |
8331 int y; | |
8332 | |
8333 for (y = 0, row = w->desired_matrix->rows; | |
8334 y < yb; | |
8335 y += row->height, ++row) | |
8336 blank_row (w, row, y); | |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
8337 goto finish_scroll_bars; |
433 | 8338 } |
8339 } | |
277 | 8340 |
25012 | 8341 /* Otherwise set up data on this window; select its buffer and point |
8342 value. */ | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8343 if (update_mode_line) |
25012 | 8344 { |
8345 /* Really select the buffer, for the sake of buffer-local | |
8346 variables. */ | |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8347 set_buffer_internal_1 (XBUFFER (w->buffer)); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8348 really_switched_buffer = 1; |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8349 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8350 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8351 set_buffer_temp (XBUFFER (w->buffer)); |
25012 | 8352 SET_TEXT_POS (opoint, PT, PT_BYTE); |
8353 | |
8354 current_matrix_up_to_date_p | |
8355 = (!NILP (w->window_end_valid) | |
8356 && !current_buffer->clip_changed | |
8357 && XFASTINT (w->last_modified) >= MODIFF | |
8358 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF); | |
8359 | |
8360 /* When windows_or_buffers_changed is non-zero, we can't rely on | |
8361 the window end being valid, so set it to nil there. */ | |
8362 if (windows_or_buffers_changed) | |
8363 { | |
8364 /* If window starts on a continuation line, maybe adjust the | |
8365 window start in case the window's width changed. */ | |
8366 if (XMARKER (w->start)->buffer == current_buffer) | |
8367 compute_window_start_on_continuation_line (w); | |
8368 | |
8369 w->window_end_valid = Qnil; | |
8370 } | |
8371 | |
8372 /* Some sanity checks. */ | |
8373 CHECK_WINDOW_END (w); | |
8374 if (Z == Z_BYTE && CHARPOS (opoint) != BYTEPOS (opoint)) | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8375 abort (); |
25012 | 8376 if (BYTEPOS (opoint) < CHARPOS (opoint)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8377 abort (); |
277 | 8378 |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8379 /* If %c is in mode line, update it if needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8380 if (!NILP (w->column_number_displayed) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8381 /* This alternative quickly identifies a common case |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8382 where no change is needed. */ |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8383 && !(PT == XFASTINT (w->last_point) |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8384 && XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8385 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF) |
12472
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8386 && XFASTINT (w->column_number_displayed) != current_column ()) |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8387 update_mode_line = 1; |
f92dc5a9194d
(clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
12410
diff
changeset
|
8388 |
25012 | 8389 /* Count number of windows showing the selected buffer. An indirect |
8390 buffer counts as its base buffer. */ | |
8391 if (!just_this_one_p) | |
10303
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8392 { |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8393 struct buffer *current_base, *window_base; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8394 current_base = current_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8395 window_base = XBUFFER (XWINDOW (selected_window)->buffer); |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8396 if (current_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8397 current_base = current_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8398 if (window_base->base_buffer) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8399 window_base = window_base->base_buffer; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8400 if (current_base == window_base) |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8401 buffer_shared++; |
e951e8dddc8b
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
9987
diff
changeset
|
8402 } |
277 | 8403 |
25012 | 8404 /* Point refers normally to the selected window. For any other |
8405 window, set up appropriate value. */ | |
277 | 8406 if (!EQ (window, selected_window)) |
8407 { | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8408 int new_pt = XMARKER (w->pointm)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8409 int new_pt_byte = marker_byte_position (w->pointm); |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8410 if (new_pt < BEGV) |
277 | 8411 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8412 new_pt = BEGV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8413 new_pt_byte = BEGV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8414 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE); |
277 | 8415 } |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8416 else if (new_pt > (ZV - 1)) |
277 | 8417 { |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8418 new_pt = ZV; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8419 new_pt_byte = ZV_BYTE; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8420 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE); |
277 | 8421 } |
25012 | 8422 |
8417
3f2854a14982
(redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents:
8386
diff
changeset
|
8423 /* We don't use SET_PT so that the point-motion hooks don't run. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8424 TEMP_SET_PT_BOTH (new_pt, new_pt_byte); |
277 | 8425 } |
8426 | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8427 /* If any of the character widths specified in the display table |
25012 | 8428 have changed, invalidate the width run cache. It's true that |
8429 this may be a bit late to catch such changes, but the rest of | |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8430 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
|
8431 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
|
8432 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
|
8433 { |
13188
dc0909e788bd
(redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents:
13104
diff
changeset
|
8434 struct Lisp_Char_Table *disptab = buffer_display_table (); |
9412
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8435 |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8436 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
|
8437 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
|
8438 { |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8439 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
|
8440 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
|
8441 BEG, Z); |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8442 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
|
8443 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8444 } |
53898786366f
* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents:
9330
diff
changeset
|
8445 |
277 | 8446 /* If window-start is screwed up, choose a new one. */ |
8447 if (XMARKER (w->start)->buffer != current_buffer) | |
8448 goto recenter; | |
8449 | |
25012 | 8450 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
277 | 8451 |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8452 /* If someone specified a new starting point but did not insist, |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8453 check whether it can be used. */ |
25012 | 8454 if (!NILP (w->optional_new_start)) |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8455 { |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8456 w->optional_new_start = Qnil; |
25012 | 8457 /* This takes a mini-buffer prompt into account. */ |
8458 start_display (&it, w, startp); | |
8459 move_it_to (&it, PT, 0, it.last_visible_y, -1, | |
8460 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); | |
8461 if (IT_CHARPOS (it) == PT) | |
16554
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8462 w->force_start = Qt; |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8463 } |
f930574421d9
(redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
16527
diff
changeset
|
8464 |
433 | 8465 /* 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
|
8466 unless the specified location is outside the accessible range. */ |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
8467 if (!NILP (w->force_start) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
8468 || w->frozen_window_start_p) |
277 | 8469 { |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8470 w->force_start = Qnil; |
25012 | 8471 w->vscroll = 0; |
8472 w->window_end_valid = Qnil; | |
8473 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8474 /* Forget any recorded base line for line number display. */ |
25012 | 8475 if (!current_matrix_up_to_date_p |
8476 || current_buffer->clip_changed) | |
8477 w->base_line_number = Qnil; | |
8478 | |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8479 /* Redisplay the mode line. Select the buffer properly for that. |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8480 Also, run the hook window-scroll-functions |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8481 because we have scrolled. */ |
13833
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8482 /* Note, we do this after clearing force_start because |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8483 if there's an error, it is better to forget about force_start |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8484 than to get into an infinite loop calling the hook functions |
467bc73e8734
(redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents:
13826
diff
changeset
|
8485 and having them get more errors. */ |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8486 if (!update_mode_line |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
8487 || ! NILP (Vwindow_scroll_functions)) |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8488 { |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8489 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8490 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8491 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8492 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8493 really_switched_buffer = 1; |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8494 } |
25012 | 8495 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8496 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8497 w->update_mode_line = Qt; |
25012 | 8498 startp = run_window_scroll_functions (window, startp); |
8499 } | |
8500 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
8501 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8502 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 8503 if (CHARPOS (startp) < BEGV) |
8504 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); | |
8505 else if (CHARPOS (startp) > ZV) | |
8506 SET_TEXT_POS (startp, ZV, ZV_BYTE); | |
8507 | |
8508 /* Redisplay, then check if cursor has been set during the | |
8509 redisplay. Give up if new fonts were loaded. */ | |
8510 if (!try_window (window, startp)) | |
8511 { | |
8512 w->force_start = Qt; | |
8513 clear_glyph_matrix (w->desired_matrix); | |
8514 goto restore_buffers; | |
8515 } | |
8516 | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
8517 if (w->cursor.vpos < 0 && !w->frozen_window_start_p) |
25012 | 8518 { |
8519 /* If point does not appear, or on a line that is not fully | |
8520 visible, move point so it does appear. The desired | |
8521 matrix has been built above, so we can use it. */ | |
8522 int height = window_box_height (w) / 2; | |
8523 struct glyph_row *row = MATRIX_ROW (w->desired_matrix, 0); | |
8524 | |
8525 while (row->y < height) | |
8526 ++row; | |
8527 | |
8528 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | |
8529 MATRIX_ROW_START_BYTEPOS (row)); | |
8530 | |
5230
8c30e49ddc04
(message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents:
5082
diff
changeset
|
8531 if (w != XWINDOW (selected_window)) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
8532 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
25012 | 8533 else if (current_buffer == old) |
8534 SET_TEXT_POS (lpoint, PT, PT_BYTE); | |
8535 | |
8536 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0); | |
8537 | |
8538 /* If we are highlighting the region, then we just changed | |
8539 the region, so redisplay to show it. */ | |
9218
db4473eb2265
(redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents:
9104
diff
changeset
|
8540 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
|
8541 && !NILP (current_buffer->mark_active)) |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
8542 { |
25012 | 8543 clear_glyph_matrix (w->desired_matrix); |
8544 if (!try_window (window, startp)) | |
8545 goto restore_buffers; | |
9420
836113a97d92
(redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents:
9412
diff
changeset
|
8546 } |
277 | 8547 } |
25012 | 8548 |
8549 make_cursor_line_fully_visible (w); | |
8550 #if GLYPH_DEBUG | |
8551 debug_method_add (w, "forced window start"); | |
8552 #endif | |
277 | 8553 goto done; |
8554 } | |
8555 | |
25012 | 8556 /* Handle case where text has not changed, only point, and it has |
8557 not moved off the frame. */ | |
8558 if (current_matrix_up_to_date_p | |
8559 /* Point may be in this window. */ | |
8560 && PT >= CHARPOS (startp) | |
8561 /* If we don't check this, we are called to move the cursor in a | |
8562 horizontally split window with a current matrix that doesn't | |
8563 fit the display. */ | |
8564 && !windows_or_buffers_changed | |
8565 /* Selective display hasn't changed. */ | |
8566 && !current_buffer->clip_changed | |
11085
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
8567 /* If force-mode-line-update was called, really redisplay; |
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
8568 that's how redisplay is forced after e.g. changing |
a9c7a7f91693
(redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents:
11066
diff
changeset
|
8569 buffer-invisibility-spec. */ |
11111
e3022a32d11d
(try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents:
11108
diff
changeset
|
8570 && NILP (w->update_mode_line) |
25012 | 8571 /* Can't use this case if highlighting a region. When a |
8572 region exists, cursor movement has to do more than just | |
8573 set the cursor. */ | |
8574 && !(!NILP (Vtransient_mark_mode) | |
8575 && !NILP (current_buffer->mark_active)) | |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8576 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8577 && NILP (Vshow_trailing_whitespace) |
25012 | 8578 /* Right after splitting windows, last_point may be nil. */ |
8579 && INTEGERP (w->last_point) | |
8580 /* This code is not used for mini-buffer for the sake of the case | |
8581 of redisplaying to replace an echo area message; since in | |
8582 that case the mini-buffer contents per se are usually | |
8583 unchanged. This code is of no real use in the mini-buffer | |
8584 since the handling of this_line_start_pos, etc., in redisplay | |
8585 handles the same cases. */ | |
8586 && !EQ (window, minibuf_window) | |
8587 /* When splitting windows or for new windows, it happens that | |
8588 redisplay is called with a nil window_end_vpos or one being | |
8589 larger than the window. This should really be fixed in | |
8590 window.c. I don't have this on my list, now, so we do | |
8591 approximately the same as the old redisplay code. --gerd. */ | |
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
|
8592 && INTEGERP (w->window_end_vpos) |
25012 | 8593 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows |
8594 && (FRAME_WINDOW_P (f) | |
8595 || !MARKERP (Voverlay_arrow_position) | |
19375
83132785cf7f
(COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents:
19225
diff
changeset
|
8596 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer)) |
277 | 8597 { |
25012 | 8598 int this_scroll_margin; |
8599 struct glyph_row *row; | |
8600 int scroll_p; | |
8601 | |
8602 #if GLYPH_DEBUG | |
8603 debug_method_add (w, "cursor movement"); | |
8604 #endif | |
8605 | |
8606 /* Scroll if point within this distance from the top or bottom | |
8607 of the window. This is a pixel value. */ | |
8608 this_scroll_margin = max (0, scroll_margin); | |
8609 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4); | |
8610 this_scroll_margin *= CANON_Y_UNIT (f); | |
8611 | |
8612 /* Start with the row the cursor was displayed during the last | |
8613 not paused redisplay. Give up if that row is not valid. */ | |
8614 if (w->last_cursor.vpos >= w->current_matrix->nrows) | |
8615 goto try_to_scroll; | |
8616 row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos); | |
8617 if (row->mode_line_p) | |
8618 ++row; | |
8619 if (!row->enabled_p) | |
8620 goto try_to_scroll; | |
8621 | |
8622 scroll_p = 0; | |
8623 if (PT > XFASTINT (w->last_point)) | |
8624 { | |
8625 /* Point has moved forward. */ | |
8626 int last_y = window_text_bottom_y (w) - this_scroll_margin; | |
8627 | |
8628 while ((MATRIX_ROW_END_CHARPOS (row) < PT | |
8629 /* The end position of a row equals the start | |
8630 position of the next row. If PT is there, we | |
8631 would rather display it in the next line, except | |
8632 when this line ends in ZV. */ | |
8633 || (MATRIX_ROW_END_CHARPOS (row) == PT | |
8634 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
8635 || !row->ends_at_zv_p))) | |
8636 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
277 | 8637 { |
25012 | 8638 xassert (row->enabled_p); |
8639 ++row; | |
8640 } | |
8641 | |
8642 /* If within the scroll margin, scroll. Note that | |
8643 MATRIX_ROW_BOTTOM_Y gives the pixel position at which the | |
8644 next line would be drawn, and that this_scroll_margin can | |
8645 be zero. */ | |
8646 if (MATRIX_ROW_BOTTOM_Y (row) > last_y | |
8647 || PT > MATRIX_ROW_END_CHARPOS (row) | |
8648 /* Line is completely visible last line in window and PT | |
8649 is to be set in the next line. */ | |
8650 || (MATRIX_ROW_BOTTOM_Y (row) == last_y | |
8651 && PT == MATRIX_ROW_END_CHARPOS (row) | |
8652 && !row->ends_at_zv_p | |
8653 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))) | |
8654 scroll_p = 1; | |
8655 } | |
8656 else if (PT < XFASTINT (w->last_point)) | |
8657 { | |
8658 /* Cursor has to be moved backward. Note that PT >= | |
8659 CHARPOS (startp) because of the outer if-statement. */ | |
8660 while (!row->mode_line_p | |
8661 && (MATRIX_ROW_START_CHARPOS (row) > PT | |
8662 || (MATRIX_ROW_START_CHARPOS (row) == PT | |
8663 && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row))) | |
8664 && (row->y > this_scroll_margin | |
8665 || CHARPOS (startp) == BEGV)) | |
8666 { | |
8667 xassert (row->enabled_p); | |
8668 --row; | |
277 | 8669 } |
25012 | 8670 |
8671 /* Consider the following case: Window starts at BEGV, there | |
8672 is invisible, intangible text at BEGV, so that display | |
8673 starts at some point START > BEGV. It can happen that | |
8674 we are called with PT somewhere between BEGV and START. | |
8675 Try to handle that case. */ | |
8676 if (row < w->current_matrix->rows | |
8677 || row->mode_line_p) | |
8678 { | |
8679 row = w->current_matrix->rows; | |
8680 if (row->mode_line_p) | |
8681 ++row; | |
8682 } | |
8683 | |
8684 /* Due to newlines in overlay strings, we may have to skip | |
8685 forward over overlay strings. */ | |
8686 while (MATRIX_ROW_END_CHARPOS (row) == PT | |
8687 && MATRIX_ROW_ENDS_IN_OVERLAY_STRING_P (row) | |
8688 && !row->ends_at_zv_p) | |
8689 ++row; | |
8690 | |
8691 /* If within the scroll margin, scroll. */ | |
8692 if (row->y < this_scroll_margin | |
8693 && CHARPOS (startp) != BEGV) | |
8694 scroll_p = 1; | |
8695 } | |
8696 | |
8697 /* if PT is not in the glyph row, give up. */ | |
8698 if (PT < MATRIX_ROW_START_CHARPOS (row) | |
8699 || PT > MATRIX_ROW_END_CHARPOS (row)) | |
8700 goto try_to_scroll; | |
8701 | |
8702 /* If we end up in a partially visible line, let's make it fully | |
8703 visible. This can be done most easily by using the existing | |
8704 scrolling code. */ | |
8705 if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) | |
8706 { | |
8707 temp_scroll_step = 1; | |
8708 goto try_to_scroll; | |
8709 } | |
8710 else if (scroll_p) | |
8711 goto try_to_scroll; | |
8712 | |
8713 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8714 goto done; | |
8715 } | |
8716 | |
277 | 8717 /* If current starting point was originally the beginning of a line |
8718 but no longer is, find a new starting point. */ | |
485 | 8719 else if (!NILP (w->start_at_line_beg) |
25012 | 8720 && !(CHARPOS (startp) <= BEGV |
8721 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')) | |
8722 { | |
8723 #if GLYPH_DEBUG | |
8724 debug_method_add (w, "recenter 1"); | |
8725 #endif | |
277 | 8726 goto recenter; |
8727 } | |
25012 | 8728 |
8729 /* Try scrolling with try_window_id. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8730 else if (/* Windows and buffers haven't changed. */ |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8731 !windows_or_buffers_changed |
25012 | 8732 /* Window must be either use window-based redisplay or |
8733 be full width. */ | |
8734 && (FRAME_WINDOW_P (f) | |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
8735 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))) |
25012 | 8736 && !MINI_WINDOW_P (w) |
8737 /* Point is not known NOT to appear in window. */ | |
8738 && PT >= CHARPOS (startp) | |
277 | 8739 && XFASTINT (w->last_modified) |
25012 | 8740 /* Window is not hscrolled. */ |
8741 && XFASTINT (w->hscroll) == 0 | |
8742 /* Selective display has not changed. */ | |
8743 && !current_buffer->clip_changed | |
8744 /* Current matrix is up to date. */ | |
8745 && !NILP (w->window_end_valid) | |
8746 /* Can't use this case if highlighting a region because | |
8747 a cursor movement will do more than just set the cursor. */ | |
2848
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8748 && !(!NILP (Vtransient_mark_mode) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8749 && !NILP (current_buffer->mark_active)) |
3bcbd1795280
(mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents:
2766
diff
changeset
|
8750 && NILP (w->region_showing) |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
8751 && NILP (Vshow_trailing_whitespace) |
25012 | 8752 /* Overlay arrow position and string not changed. */ |
19205
7448901d6449
(COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
19197
diff
changeset
|
8753 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position)) |
277 | 8754 && EQ (last_arrow_string, Voverlay_arrow_string) |
25012 | 8755 /* Value is > 0 if update has been done, it is -1 if we |
8756 know that the same window start will not work. It is 0 | |
8757 if unsuccessful for some other reason. */ | |
8758 && (tem = try_window_id (w)) != 0) | |
8759 { | |
8760 #if GLYPH_DEBUG | |
8761 debug_method_add (w, "try_window_id"); | |
8762 #endif | |
8763 | |
8764 if (fonts_changed_p) | |
8765 goto restore_buffers; | |
277 | 8766 if (tem > 0) |
8767 goto done; | |
25012 | 8768 /* Otherwise try_window_id has returned -1 which means that we |
8769 don't want the alternative below this comment to execute. */ | |
8770 } | |
8771 else if (CHARPOS (startp) >= BEGV | |
8772 && CHARPOS (startp) <= ZV | |
8773 && PT >= CHARPOS (startp) | |
8774 && (CHARPOS (startp) < ZV | |
14662
9e8607589f03
(redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents:
14614
diff
changeset
|
8775 /* Avoid starting at end of buffer. */ |
25012 | 8776 || CHARPOS (startp) == BEGV |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8777 || (XFASTINT (w->last_modified) >= MODIFF |
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8778 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) |
277 | 8779 { |
25012 | 8780 #if GLYPH_DEBUG |
8781 debug_method_add (w, "same window start"); | |
8782 #endif | |
8783 | |
8784 /* Try to redisplay starting at same place as before. | |
8785 If point has not moved off frame, accept the results. */ | |
8786 if (!current_matrix_up_to_date_p | |
8787 /* Don't use try_window_reusing_current_matrix in this case | |
8788 because it can have changed the buffer. */ | |
8789 || !NILP (Vwindow_scroll_functions) | |
8790 || MINI_WINDOW_P (w) | |
8791 || !try_window_reusing_current_matrix (w)) | |
8792 { | |
8793 IF_DEBUG (debug_method_add (w, "1")); | |
8794 try_window (window, startp); | |
8795 } | |
8796 | |
8797 if (fonts_changed_p) | |
8798 goto restore_buffers; | |
8799 | |
8800 if (w->cursor.vpos >= 0) | |
8801 { | |
8802 if (!just_this_one_p | |
8803 || current_buffer->clip_changed | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
8804 || BEG_UNCHANGED < CHARPOS (startp)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8805 /* 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
|
8806 w->base_line_number = Qnil; |
25012 | 8807 |
8808 make_cursor_line_fully_visible (w); | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8809 goto done; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8810 } |
277 | 8811 else |
25012 | 8812 clear_glyph_matrix (w->desired_matrix); |
8813 } | |
8814 | |
8815 try_to_scroll: | |
277 | 8816 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
8817 XSETFASTINT (w->last_modified, 0); |
16197
952b01cdfa56
(redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents:
16095
diff
changeset
|
8818 XSETFASTINT (w->last_overlay_modified, 0); |
25012 | 8819 |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8820 /* Redisplay the mode line. Select the buffer properly for that. */ |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8821 if (!update_mode_line) |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8822 { |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8823 if (!really_switched_buffer) |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8824 { |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8825 set_buffer_temp (old); |
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8826 set_buffer_internal_1 (XBUFFER (w->buffer)); |
25012 | 8827 really_switched_buffer = 1; |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
8828 } |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8829 update_mode_line = 1; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8830 w->update_mode_line = Qt; |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8831 } |
277 | 8832 |
25012 | 8833 /* Try to scroll by specified few lines. */ |
8834 if ((scroll_conservatively | |
8835 || scroll_step | |
8836 || temp_scroll_step | |
8837 || NUMBERP (current_buffer->scroll_up_aggressively) | |
8838 || NUMBERP (current_buffer->scroll_down_aggressively)) | |
22030
484c9b2f6308
(redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents:
22011
diff
changeset
|
8839 && !current_buffer->clip_changed |
25012 | 8840 && CHARPOS (startp) >= BEGV |
8841 && CHARPOS (startp) <= ZV) | |
8842 { | |
8843 /* The function returns -1 if new fonts were loaded, 1 if | |
8844 successful, 0 if not successful. */ | |
8845 int rc = try_scrolling (window, just_this_one_p, | |
8846 scroll_conservatively, | |
8847 scroll_step, | |
8848 temp_scroll_step); | |
8849 if (rc > 0) | |
8850 goto done; | |
8851 else if (rc < 0) | |
8852 goto restore_buffers; | |
8853 } | |
8854 | |
8855 /* Finally, just choose place to start which centers point */ | |
8856 | |
8857 recenter: | |
8858 | |
8859 #if GLYPH_DEBUG | |
8860 debug_method_add (w, "recenter"); | |
8861 #endif | |
8862 | |
8863 /* w->vscroll = 0; */ | |
8864 | |
8865 /* Forget any previously recorded base line for line number display. */ | |
8866 if (!current_matrix_up_to_date_p | |
8867 || current_buffer->clip_changed) | |
8868 w->base_line_number = Qnil; | |
8869 | |
8870 /* Move backward half the height of the window. */ | |
8871 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
8872 it.current_y = it.last_visible_y; | |
8873 move_it_vertically_backward (&it, it.last_visible_y / 2); | |
8874 xassert (IT_CHARPOS (it) >= BEGV); | |
8875 | |
8876 /* The function move_it_vertically_backward may move over more | |
8877 than the specified y-distance. If it->w is small, e.g. a | |
8878 mini-buffer window, we may end up in front of the window's | |
8879 display area. Start displaying at the start of the line | |
8880 containing PT in this case. */ | |
8881 if (it.current_y <= 0) | |
8882 { | |
8883 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); | |
8884 move_it_vertically (&it, 0); | |
8885 xassert (IT_CHARPOS (it) <= PT); | |
8886 it.current_y = 0; | |
8887 } | |
8888 | |
8889 it.current_x = it.hpos = 0; | |
8890 | |
8891 /* Set startp here explicitly in case that helps avoid an infinite loop | |
8892 in case the window-scroll-functions functions get errors. */ | |
8893 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); | |
8894 | |
8895 /* Run scroll hooks. */ | |
8896 startp = run_window_scroll_functions (window, it.current.pos); | |
8897 | |
8898 /* Redisplay the window. */ | |
8899 if (!current_matrix_up_to_date_p | |
8900 || windows_or_buffers_changed | |
8901 /* Don't use try_window_reusing_current_matrix in this case | |
8902 because it can have changed the buffer. */ | |
8903 || !NILP (Vwindow_scroll_functions) | |
8904 || !just_this_one_p | |
8905 || MINI_WINDOW_P (w) | |
8906 || !try_window_reusing_current_matrix (w)) | |
8907 try_window (window, startp); | |
8908 | |
8909 /* If new fonts have been loaded (due to fontsets), give up. We | |
8910 have to start a new redisplay since we need to re-adjust glyph | |
8911 matrices. */ | |
8912 if (fonts_changed_p) | |
8913 goto restore_buffers; | |
8914 | |
8915 /* If cursor did not appear assume that the middle of the window is | |
8916 in the first line of the window. Do it again with the next line. | |
8917 (Imagine a window of height 100, displaying two lines of height | |
8918 60. Moving back 50 from it->last_visible_y will end in the first | |
8919 line.) */ | |
8920 if (w->cursor.vpos < 0) | |
8921 { | |
8922 if (!NILP (w->window_end_valid) | |
8923 && PT >= Z - XFASTINT (w->window_end_pos)) | |
8924 { | |
8925 clear_glyph_matrix (w->desired_matrix); | |
8926 move_it_by_lines (&it, 1, 0); | |
8927 try_window (window, it.current.pos); | |
8928 } | |
8929 else if (PT < IT_CHARPOS (it)) | |
8930 { | |
8931 clear_glyph_matrix (w->desired_matrix); | |
8932 move_it_by_lines (&it, -1, 0); | |
8933 try_window (window, it.current.pos); | |
19571
28ab022089b2
(redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents:
19562
diff
changeset
|
8934 } |
21845
1bae35c78db2
(redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents:
21825
diff
changeset
|
8935 else |
25012 | 8936 { |
8937 /* Not much we can do about it. */ | |
8938 } | |
8939 } | |
8940 | |
8941 /* Consider the following case: Window starts at BEGV, there is | |
8942 invisible, intangible text at BEGV, so that display starts at | |
8943 some point START > BEGV. It can happen that we are called with | |
8944 PT somewhere between BEGV and START. Try to handle that case. */ | |
8945 if (w->cursor.vpos < 0) | |
8946 { | |
8947 struct glyph_row *row = w->current_matrix->rows; | |
8948 if (row->mode_line_p) | |
8949 ++row; | |
8950 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); | |
8951 } | |
8952 | |
8953 make_cursor_line_fully_visible (w); | |
8954 | |
25695
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
8955 done: |
9e6edb8bc242
(redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents:
25693
diff
changeset
|
8956 |
25012 | 8957 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
8958 w->start_at_line_beg = ((CHARPOS (startp) == BEGV | |
8959 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n') | |
8960 ? Qt : Qnil); | |
8961 | |
8962 /* Display the mode line, if we must. */ | |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
8963 if ((update_mode_line |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
8964 /* If window not full width, must redo its mode line |
25012 | 8965 if (a) the window to its side is being redone and |
8966 (b) we do a frame-based redisplay. This is a consequence | |
8967 of how inverted lines are drawn in frame-based redisplay. */ | |
8968 || (!just_this_one_p | |
8969 && !FRAME_WINDOW_P (f) | |
8970 && !WINDOW_FULL_WIDTH_P (w)) | |
8971 /* Line number to display. */ | |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
8972 || INTEGERP (w->base_line_pos) |
25012 | 8973 /* Column number is displayed and different from the one displayed. */ |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
8974 || (!NILP (w->column_number_displayed) |
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
8975 && XFASTINT (w->column_number_displayed) != current_column ())) |
25012 | 8976 /* This means that the window has a mode line. */ |
8977 && (WINDOW_WANTS_MODELINE_P (w) | |
25546 | 8978 || WINDOW_WANTS_HEADER_LINE_P (w))) |
25012 | 8979 { |
8980 display_mode_lines (w); | |
8981 | |
8982 /* If mode line height has changed, arrange for a thorough | |
8983 immediate redisplay using the correct mode line height. */ | |
8984 if (WINDOW_WANTS_MODELINE_P (w) | |
8985 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w)) | |
8986 { | |
8987 fonts_changed_p = 1; | |
8988 MATRIX_MODE_LINE_ROW (w->current_matrix)->height | |
8989 = DESIRED_MODE_LINE_HEIGHT (w); | |
8990 } | |
8991 | |
8992 /* If top line height has changed, arrange for a thorough | |
8993 immediate redisplay using the correct mode line height. */ | |
25546 | 8994 if (WINDOW_WANTS_HEADER_LINE_P (w) |
8995 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w)) | |
25012 | 8996 { |
8997 fonts_changed_p = 1; | |
25546 | 8998 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height |
8999 = DESIRED_HEADER_LINE_HEIGHT (w); | |
25012 | 9000 } |
9001 | |
9002 if (fonts_changed_p) | |
9003 goto restore_buffers; | |
9004 } | |
9005 | |
9006 if (!line_number_displayed | |
9007 && !BUFFERP (w->base_line_pos)) | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9008 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9009 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9010 w->base_line_number = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
9011 } |
277 | 9012 |
25012 | 9013 finish_menu_bars: |
9014 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9015 /* When we reach a frame's selected window, redo the frame's menu bar. */ |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9016 if (update_mode_line |
25012 | 9017 && EQ (FRAME_SELECTED_WINDOW (f), window)) |
9018 { | |
9019 int redisplay_menu_p = 0; | |
9020 | |
9021 if (FRAME_WINDOW_P (f)) | |
9022 { | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
9023 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) |
25012 | 9024 redisplay_menu_p = FRAME_EXTERNAL_MENU_BAR (f); |
5658
4e3a6baa4750
(display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5340
diff
changeset
|
9025 #else |
25012 | 9026 redisplay_menu_p = 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
|
9027 #endif |
25012 | 9028 } |
9029 else | |
9030 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0; | |
9031 | |
9032 if (redisplay_menu_p) | |
9033 display_menu_bar (w); | |
9034 | |
9035 #ifdef HAVE_WINDOW_SYSTEM | |
25543 | 9036 if (WINDOWP (f->tool_bar_window) |
9037 && (FRAME_TOOL_BAR_LINES (f) > 0 | |
9038 || auto_resize_tool_bars_p)) | |
9039 redisplay_tool_bar (f); | |
25012 | 9040 #endif |
9041 } | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
9042 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9043 finish_scroll_bars: |
25012 | 9044 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9045 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
|
9046 { |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9047 int start, end, whole; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9048 |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9049 /* 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
|
9050 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
|
9051 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
|
9052 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
|
9053 visible region. |
80805283464a
* xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents:
2848
diff
changeset
|
9054 |
25012 | 9055 Note that mini-buffers sometimes aren't displaying any text. */ |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
9056 if (!MINI_WINDOW_P (w) |
25012 | 9057 || (w == XWINDOW (minibuf_window) |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
9058 && NILP (echo_area_buffer[0]))) |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9059 { |
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
|
9060 whole = ZV - BEGV; |
11108
ad6e21535db6
(redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents:
11085
diff
changeset
|
9061 start = marker_position (w->start) - BEGV; |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9062 /* 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
|
9063 moment, we'll pretend it is. */ |
25012 | 9064 end = (Z - XFASTINT (w->window_end_pos)) - BEGV; |
9065 | |
9066 if (end < start) | |
9067 end = start; | |
9068 if (whole < (end - start)) | |
9069 whole = end - start; | |
1785
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9070 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9071 else |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9072 start = end = whole = 0; |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9073 |
1992
37c45885540a
* xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents:
1873
diff
changeset
|
9074 /* 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
|
9075 (*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
|
9076 |
25012 | 9077 /* Note that we actually used the scroll bar attached to this |
9078 window, 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
|
9079 (*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
|
9080 } |
19755499df90
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1718
diff
changeset
|
9081 |
25012 | 9082 restore_buffers: |
9083 | |
9084 /* Restore current_buffer and value of point in it. */ | |
9085 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint)); | |
21424
fbfd26142e76
(redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents:
21335
diff
changeset
|
9086 if (really_switched_buffer) |
11888
23ec1c193810
(redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents:
11874
diff
changeset
|
9087 set_buffer_internal_1 (old); |
10764
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9088 else |
a3e635f3501e
(redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents:
10688
diff
changeset
|
9089 set_buffer_temp (old); |
25012 | 9090 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9091 |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
9092 unbind_to (count, Qnil); |
277 | 9093 } |
25012 | 9094 |
9095 | |
9096 /* Build the complete desired matrix of WINDOW with a window start | |
9097 buffer position POS. Value is non-zero if successful. It is zero | |
9098 if fonts were loaded during redisplay which makes re-adjusting | |
9099 glyph matrices necessary. */ | |
9100 | |
9101 int | |
277 | 9102 try_window (window, pos) |
9103 Lisp_Object window; | |
25012 | 9104 struct text_pos pos; |
9105 { | |
9106 struct window *w = XWINDOW (window); | |
9107 struct it it; | |
9108 struct glyph_row *last_text_row = NULL; | |
9109 | |
9110 /* Make POS the new window start. */ | |
9111 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos)); | |
9112 | |
9113 /* Mark cursor position as unknown. No overlay arrow seen. */ | |
9114 w->cursor.vpos = -1; | |
277 | 9115 overlay_arrow_seen = 0; |
25012 | 9116 |
9117 /* Initialize iterator and info to start at POS. */ | |
9118 start_display (&it, w, pos); | |
9119 | |
9120 /* Display all lines of W. */ | |
9121 while (it.current_y < it.last_visible_y) | |
9122 { | |
9123 if (display_line (&it)) | |
9124 last_text_row = it.glyph_row - 1; | |
9125 if (fonts_changed_p) | |
9126 return 0; | |
9127 } | |
9128 | |
9129 /* If bottom moved off end of frame, change mode line percentage. */ | |
9130 if (XFASTINT (w->window_end_pos) <= 0 | |
9131 && Z != IT_CHARPOS (it)) | |
277 | 9132 w->update_mode_line = Qt; |
9133 | |
25012 | 9134 /* Set window_end_pos to the offset of the last character displayed |
9135 on the window from the end of current_buffer. Set | |
9136 window_end_vpos to its row number. */ | |
9137 if (last_text_row) | |
9138 { | |
9139 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row)); | |
9140 w->window_end_bytepos | |
9141 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9142 XSETFASTINT (w->window_end_pos, | |
9143 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9144 XSETFASTINT (w->window_end_vpos, | |
9145 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9146 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos)) | |
9147 ->displays_text_p); | |
9148 } | |
9149 else | |
9150 { | |
9151 w->window_end_bytepos = 0; | |
9152 XSETFASTINT (w->window_end_pos, 0); | |
9153 XSETFASTINT (w->window_end_vpos, 0); | |
9154 } | |
9155 | |
277 | 9156 /* But that is not valid info until redisplay finishes. */ |
9157 w->window_end_valid = Qnil; | |
25012 | 9158 return 1; |
9159 } | |
9160 | |
9161 | |
277 | 9162 |
25012 | 9163 /************************************************************************ |
9164 Window redisplay reusing current matrix when buffer has not changed | |
9165 ************************************************************************/ | |
9166 | |
9167 /* Try redisplay of window W showing an unchanged buffer with a | |
9168 different window start than the last time it was displayed by | |
9169 reusing its current matrix. Value is non-zero if successful. | |
9170 W->start is the new window start. */ | |
9171 | |
9172 static int | |
9173 try_window_reusing_current_matrix (w) | |
9174 struct window *w; | |
9175 { | |
9176 struct frame *f = XFRAME (w->frame); | |
9177 struct glyph_row *row, *bottom_row; | |
9178 struct it it; | |
9179 struct run run; | |
9180 struct text_pos start, new_start; | |
9181 int nrows_scrolled, i; | |
9182 struct glyph_row *last_text_row; | |
9183 struct glyph_row *last_reused_text_row; | |
9184 struct glyph_row *start_row; | |
9185 int start_vpos, min_y, max_y; | |
9186 | |
9187 /* Right now this function doesn't handle terminal frames. */ | |
9188 if (!FRAME_WINDOW_P (f)) | |
9189 return 0; | |
9190 | |
9191 /* Can't do this if region may have changed. */ | |
9192 if ((!NILP (Vtransient_mark_mode) | |
9193 && !NILP (current_buffer->mark_active)) | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9194 || !NILP (w->region_showing) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
9195 || !NILP (Vshow_trailing_whitespace)) |
25012 | 9196 return 0; |
9197 | |
9198 /* If top-line visibility has changed, give up. */ | |
25546 | 9199 if (WINDOW_WANTS_HEADER_LINE_P (w) |
9200 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p) | |
25012 | 9201 return 0; |
9202 | |
9203 /* Give up if old or new display is scrolled vertically. We could | |
9204 make this function handle this, but right now it doesn't. */ | |
9205 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9206 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row)) | |
9207 return 0; | |
9208 | |
9209 /* The variable new_start now holds the new window start. The old | |
9210 start `start' can be determined from the current matrix. */ | |
9211 SET_TEXT_POS_FROM_MARKER (new_start, w->start); | |
9212 start = start_row->start.pos; | |
9213 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); | |
9214 | |
9215 /* Clear the desired matrix for the display below. */ | |
9216 clear_glyph_matrix (w->desired_matrix); | |
9217 | |
9218 if (CHARPOS (new_start) <= CHARPOS (start)) | |
9219 { | |
9220 int first_row_y; | |
9221 | |
9222 IF_DEBUG (debug_method_add (w, "twu1")); | |
9223 | |
9224 /* Display up to a row that can be reused. The variable | |
9225 last_text_row is set to the last row displayed that displays | |
9226 text. */ | |
9227 start_display (&it, w, new_start); | |
9228 first_row_y = it.current_y; | |
9229 w->cursor.vpos = -1; | |
9230 last_text_row = last_reused_text_row = NULL; | |
9231 while (it.current_y < it.last_visible_y | |
9232 && IT_CHARPOS (it) < CHARPOS (start) | |
9233 && !fonts_changed_p) | |
9234 if (display_line (&it)) | |
9235 last_text_row = it.glyph_row - 1; | |
9236 | |
9237 /* A value of current_y < last_visible_y means that we stopped | |
9238 at the previous window start, which in turn means that we | |
9239 have at least one reusable row. */ | |
9240 if (it.current_y < it.last_visible_y) | |
9241 { | |
9242 nrows_scrolled = it.vpos; | |
9243 | |
9244 /* Find PT if not already found in the lines displayed. */ | |
9245 if (w->cursor.vpos < 0) | |
9246 { | |
9247 int dy = it.current_y - first_row_y; | |
9248 | |
9249 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9250 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9251 { | |
9252 if (PT >= MATRIX_ROW_START_CHARPOS (row) | |
9253 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
9254 { | |
9255 set_cursor_from_row (w, row, w->current_matrix, 0, 0, | |
9256 dy, nrows_scrolled); | |
9257 break; | |
9258 } | |
9259 | |
9260 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y) | |
9261 break; | |
9262 | |
9263 ++row; | |
9264 } | |
9265 | |
9266 /* Give up if point was not found. This shouldn't | |
9267 happen often; not more often than with try_window | |
9268 itself. */ | |
9269 if (w->cursor.vpos < 0) | |
9270 { | |
9271 clear_glyph_matrix (w->desired_matrix); | |
9272 return 0; | |
9273 } | |
9274 } | |
9275 | |
9276 /* Scroll the display. Do it before the current matrix is | |
9277 changed. The problem here is that update has not yet | |
9278 run, i.e. part of the current matrix is not up to date. | |
9279 scroll_run_hook will clear the cursor, and use the | |
9280 current matrix to get the height of the row the cursor is | |
9281 in. */ | |
9282 run.current_y = first_row_y; | |
9283 run.desired_y = it.current_y; | |
9284 run.height = it.last_visible_y - it.current_y; | |
9285 if (run.height > 0) | |
9286 { | |
9287 update_begin (f); | |
9288 rif->update_window_begin_hook (w); | |
9289 rif->scroll_run_hook (w, &run); | |
9290 rif->update_window_end_hook (w, 0); | |
9291 update_end (f); | |
9292 } | |
9293 | |
9294 /* Shift current matrix down by nrows_scrolled lines. */ | |
9295 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9296 rotate_matrix (w->current_matrix, | |
9297 start_vpos, | |
9298 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9299 nrows_scrolled); | |
9300 | |
9301 /* Disable lines not reused. */ | |
9302 for (i = 0; i < it.vpos; ++i) | |
9303 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
9304 | |
9305 /* Re-compute Y positions. */ | |
9306 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix) + nrows_scrolled; | |
25546 | 9307 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9308 max_y = it.last_visible_y; |
9309 while (row < bottom_row) | |
9310 { | |
9311 row->y = it.current_y; | |
9312 | |
9313 if (row->y < min_y) | |
9314 row->visible_height = row->height - (min_y - row->y); | |
9315 else if (row->y + row->height > max_y) | |
9316 row->visible_height | |
9317 = row->height - (row->y + row->height - max_y); | |
9318 else | |
9319 row->visible_height = row->height; | |
9320 | |
9321 it.current_y += row->height; | |
9322 ++it.vpos; | |
9323 | |
9324 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9325 last_reused_text_row = row; | |
9326 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y) | |
9327 break; | |
9328 ++row; | |
9329 } | |
9330 } | |
9331 | |
9332 /* Update window_end_pos etc.; last_reused_text_row is the last | |
9333 reused row from the current matrix containing text, if any. | |
9334 The value of last_text_row is the last displayed line | |
9335 containing text. */ | |
9336 if (last_reused_text_row) | |
9337 { | |
9338 w->window_end_bytepos | |
9339 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row); | |
9340 XSETFASTINT (w->window_end_pos, | |
9341 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row)); | |
9342 XSETFASTINT (w->window_end_vpos, | |
9343 MATRIX_ROW_VPOS (last_reused_text_row, | |
9344 w->current_matrix)); | |
9345 } | |
9346 else if (last_text_row) | |
9347 { | |
9348 w->window_end_bytepos | |
9349 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9350 XSETFASTINT (w->window_end_pos, | |
9351 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9352 XSETFASTINT (w->window_end_vpos, | |
9353 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9354 } | |
9355 else | |
9356 { | |
9357 /* This window must be completely empty. */ | |
9358 w->window_end_bytepos = 0; | |
9359 XSETFASTINT (w->window_end_pos, 0); | |
9360 XSETFASTINT (w->window_end_vpos, 0); | |
9361 } | |
9362 w->window_end_valid = Qnil; | |
9363 | |
9364 /* Update hint: don't try scrolling again in update_window. */ | |
9365 w->desired_matrix->no_scrolling_p = 1; | |
9366 | |
9367 #if GLYPH_DEBUG | |
9368 debug_method_add (w, "try_window_reusing_current_matrix 1"); | |
9369 #endif | |
9370 return 1; | |
9371 } | |
9372 else if (CHARPOS (new_start) > CHARPOS (start)) | |
9373 { | |
9374 struct glyph_row *pt_row, *row; | |
9375 struct glyph_row *first_reusable_row; | |
9376 struct glyph_row *first_row_to_display; | |
9377 int dy; | |
9378 int yb = window_text_bottom_y (w); | |
9379 | |
9380 IF_DEBUG (debug_method_add (w, "twu2")); | |
9381 | |
9382 /* Find the row starting at new_start, if there is one. Don't | |
9383 reuse a partially visible line at the end. */ | |
9384 first_reusable_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9385 while (first_reusable_row->enabled_p | |
9386 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb | |
9387 && (MATRIX_ROW_START_CHARPOS (first_reusable_row) | |
9388 < CHARPOS (new_start))) | |
9389 ++first_reusable_row; | |
9390 | |
9391 /* Give up if there is no row to reuse. */ | |
9392 if (MATRIX_ROW_BOTTOM_Y (first_reusable_row) >= yb | |
25316
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9393 || !first_reusable_row->enabled_p |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9394 || (MATRIX_ROW_START_CHARPOS (first_reusable_row) |
561aa7ea85a7
(unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25305
diff
changeset
|
9395 != CHARPOS (new_start))) |
25012 | 9396 return 0; |
9397 | |
9398 /* We can reuse fully visible rows beginning with | |
9399 first_reusable_row to the end of the window. Set | |
9400 first_row_to_display to the first row that cannot be reused. | |
9401 Set pt_row to the row containing point, if there is any. */ | |
9402 first_row_to_display = first_reusable_row; | |
9403 pt_row = NULL; | |
9404 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb) | |
9405 { | |
9406 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display) | |
9407 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display)) | |
9408 pt_row = first_row_to_display; | |
9409 | |
9410 ++first_row_to_display; | |
9411 } | |
9412 | |
9413 /* Start displaying at the start of first_row_to_display. */ | |
9414 xassert (first_row_to_display->y < yb); | |
9415 init_to_row_start (&it, w, first_row_to_display); | |
9416 nrows_scrolled = MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix); | |
9417 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix) | |
9418 - nrows_scrolled); | |
9419 it.current_y = first_row_to_display->y - first_reusable_row->y; | |
9420 | |
9421 /* Display lines beginning with first_row_to_display in the | |
9422 desired matrix. Set last_text_row to the last row displayed | |
9423 that displays text. */ | |
9424 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos); | |
9425 if (pt_row == NULL) | |
9426 w->cursor.vpos = -1; | |
9427 last_text_row = NULL; | |
9428 while (it.current_y < it.last_visible_y && !fonts_changed_p) | |
9429 if (display_line (&it)) | |
9430 last_text_row = it.glyph_row - 1; | |
9431 | |
9432 /* Give up If point isn't in a row displayed or reused. */ | |
9433 if (w->cursor.vpos < 0) | |
9434 { | |
9435 clear_glyph_matrix (w->desired_matrix); | |
9436 return 0; | |
9437 } | |
9438 | |
9439 /* If point is in a reused row, adjust y and vpos of the cursor | |
9440 position. */ | |
9441 if (pt_row) | |
9442 { | |
9443 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row, | |
9444 w->current_matrix); | |
9445 w->cursor.y -= first_reusable_row->y; | |
9446 } | |
9447 | |
9448 /* Scroll the display. */ | |
9449 run.current_y = first_reusable_row->y; | |
25546 | 9450 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9451 run.height = it.last_visible_y - run.current_y; |
9452 if (run.height) | |
9453 { | |
9454 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
9455 update_begin (f); | |
9456 rif->update_window_begin_hook (w); | |
9457 rif->scroll_run_hook (w, &run); | |
9458 rif->update_window_end_hook (w, 0); | |
9459 update_end (f); | |
9460 } | |
9461 | |
9462 /* Adjust Y positions of reused rows. */ | |
9463 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | |
9464 row = first_reusable_row; | |
9465 dy = first_reusable_row->y; | |
25546 | 9466 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 9467 max_y = it.last_visible_y; |
9468 while (row < first_row_to_display) | |
9469 { | |
9470 row->y -= dy; | |
9471 if (row->y < min_y) | |
9472 row->visible_height = row->height - (min_y - row->y); | |
9473 else if (row->y + row->height > max_y) | |
9474 row->visible_height | |
9475 = row->height - (row->y + row->height - max_y); | |
9476 else | |
9477 row->visible_height = row->height; | |
9478 ++row; | |
9479 } | |
9480 | |
9481 /* Disable rows not reused. */ | |
9482 while (row < bottom_row) | |
9483 { | |
9484 row->enabled_p = 0; | |
9485 ++row; | |
9486 } | |
9487 | |
9488 /* Scroll the current matrix. */ | |
9489 xassert (nrows_scrolled > 0); | |
9490 rotate_matrix (w->current_matrix, | |
9491 start_vpos, | |
9492 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), | |
9493 -nrows_scrolled); | |
9494 | |
9495 /* Adjust window end. A null value of last_text_row means that | |
9496 the window end is in reused rows which in turn means that | |
9497 only its vpos can have changed. */ | |
9498 if (last_text_row) | |
9499 { | |
9500 w->window_end_bytepos | |
9501 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
9502 XSETFASTINT (w->window_end_pos, | |
9503 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
9504 XSETFASTINT (w->window_end_vpos, | |
9505 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)); | |
9506 } | |
9507 else | |
9508 { | |
9509 XSETFASTINT (w->window_end_vpos, | |
9510 XFASTINT (w->window_end_vpos) - nrows_scrolled); | |
9511 } | |
9512 | |
9513 w->window_end_valid = Qnil; | |
9514 w->desired_matrix->no_scrolling_p = 1; | |
9515 | |
9516 #if GLYPH_DEBUG | |
9517 debug_method_add (w, "try_window_reusing_current_matrix 2"); | |
9518 #endif | |
9519 return 1; | |
9520 } | |
9521 | |
9522 return 0; | |
9523 } | |
9524 | |
9525 | |
9526 | |
9527 /************************************************************************ | |
9528 Window redisplay reusing current matrix when buffer has changed | |
9529 ************************************************************************/ | |
9530 | |
9531 static struct glyph_row *get_last_unchanged_at_beg_row P_ ((struct window *)); | |
9532 static struct glyph_row *get_first_unchanged_at_end_row P_ ((struct window *, | |
9533 int *, int *)); | |
9534 static struct glyph_row * | |
9535 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, | |
9536 struct glyph_row *)); | |
9537 | |
9538 | |
9539 /* Return the last row in MATRIX displaying text. If row START is | |
9540 non-null, start searching with that row. IT gives the dimensions | |
9541 of the display. Value is null if matrix is empty; otherwise it is | |
9542 a pointer to the row found. */ | |
9543 | |
9544 static struct glyph_row * | |
9545 find_last_row_displaying_text (matrix, it, start) | |
9546 struct glyph_matrix *matrix; | |
9547 struct it *it; | |
9548 struct glyph_row *start; | |
9549 { | |
9550 struct glyph_row *row, *row_found; | |
9551 | |
9552 /* Set row_found to the last row in IT->w's current matrix | |
9553 displaying text. The loop looks funny but think of partially | |
9554 visible lines. */ | |
9555 row_found = NULL; | |
9556 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix); | |
9557 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9558 { | |
9559 xassert (row->enabled_p); | |
9560 row_found = row; | |
9561 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y) | |
9562 break; | |
9563 ++row; | |
9564 } | |
9565 | |
9566 return row_found; | |
9567 } | |
9568 | |
9569 | |
9570 /* Return the last row in the current matrix of W that is not affected | |
9571 by changes at the start of current_buffer that occurred since the | |
9572 last time W was redisplayed. Value is null if no such row exists. | |
9573 | |
9574 The global variable beg_unchanged has to contain the number of | |
9575 bytes unchanged at the start of current_buffer. BEG + | |
9576 beg_unchanged is the buffer position of the first changed byte in | |
9577 current_buffer. Characters at positions < BEG + beg_unchanged are | |
9578 at the same buffer positions as they were when the current matrix | |
9579 was built. */ | |
9580 | |
9581 static struct glyph_row * | |
9582 get_last_unchanged_at_beg_row (w) | |
9583 struct window *w; | |
9584 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9585 int first_changed_pos = BEG + BEG_UNCHANGED; |
25012 | 9586 struct glyph_row *row; |
9587 struct glyph_row *row_found = NULL; | |
9588 int yb = window_text_bottom_y (w); | |
9589 | |
9590 /* Find the last row displaying unchanged text. */ | |
9591 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9592 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
9593 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos) | |
9594 { | |
9595 if (/* If row ends before first_changed_pos, it is unchanged, | |
9596 except in some case. */ | |
9597 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos | |
9598 /* When row ends in ZV and we write at ZV it is not | |
9599 unchanged. */ | |
9600 && !row->ends_at_zv_p | |
9601 /* When first_changed_pos is the end of a continued line, | |
9602 row is not unchanged because it may be no longer | |
9603 continued. */ | |
9604 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos | |
9605 && row->continued_p)) | |
9606 row_found = row; | |
9607 | |
9608 /* Stop if last visible row. */ | |
9609 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
9610 break; | |
9611 | |
9612 ++row; | |
9613 } | |
9614 | |
9615 return row_found; | |
9616 } | |
9617 | |
9618 | |
9619 /* Find the first glyph row in the current matrix of W that is not | |
9620 affected by changes at the end of current_buffer since the last | |
9621 time the window was redisplayed. Return in *DELTA the number of | |
25388
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
9622 chars by which buffer positions in unchanged text at the end of |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
9623 current_buffer must be adjusted. Return in *DELTA_BYTES the |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
9624 corresponding number of bytes. Value is null if no such row |
b38732c75a65
(redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents:
25377
diff
changeset
|
9625 exists, i.e. all rows are affected by changes. */ |
25012 | 9626 |
9627 static struct glyph_row * | |
9628 get_first_unchanged_at_end_row (w, delta, delta_bytes) | |
9629 struct window *w; | |
9630 int *delta, *delta_bytes; | |
9631 { | |
9632 struct glyph_row *row; | |
9633 struct glyph_row *row_found = NULL; | |
9634 | |
9635 *delta = *delta_bytes = 0; | |
9636 | |
9637 /* A value of window_end_pos >= end_unchanged means that the window | |
9638 end is in the range of changed text. If so, there is no | |
9639 unchanged row at the end of W's current matrix. */ | |
9640 xassert (!NILP (w->window_end_valid)); | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9641 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED) |
25012 | 9642 return NULL; |
9643 | |
9644 /* Set row to the last row in W's current matrix displaying text. */ | |
9645 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
9646 | |
9647 /* If matrix is entirely empty, no unchanged row exists. */ | |
9648 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
9649 { | |
9650 /* The value of row is the last glyph row in the matrix having a | |
9651 meaningful buffer position in it. The end position of row | |
9652 corresponds to window_end_pos. This allows us to translate | |
9653 buffer positions in the current matrix to current buffer | |
9654 positions for characters not in changed text. */ | |
9655 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos); | |
9656 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos; | |
9657 int last_unchanged_pos, last_unchanged_pos_old; | |
9658 struct glyph_row *first_text_row | |
9659 = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9660 | |
9661 *delta = Z - Z_old; | |
9662 *delta_bytes = Z_BYTE - Z_BYTE_old; | |
9663 | |
9664 /* Set last_unchanged_pos to the buffer position of the last | |
9665 character in the buffer that has not been changed. Z is the | |
9666 index + 1 of the last byte in current_buffer, i.e. by | |
9667 subtracting end_unchanged we get the index of the last | |
9668 unchanged character, and we have to add BEG to get its buffer | |
9669 position. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9670 last_unchanged_pos = Z - END_UNCHANGED + BEG; |
25012 | 9671 last_unchanged_pos_old = last_unchanged_pos - *delta; |
9672 | |
9673 /* Search backward from ROW for a row displaying a line that | |
9674 starts at a minimum position >= last_unchanged_pos_old. */ | |
9675 while (row >= first_text_row) | |
9676 { | |
9677 xassert (row->enabled_p); | |
9678 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
9679 | |
9680 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old) | |
9681 row_found = row; | |
9682 --row; | |
9683 } | |
9684 } | |
9685 | |
9686 xassert (!row_found || MATRIX_ROW_DISPLAYS_TEXT_P (row_found)); | |
9687 return row_found; | |
9688 } | |
9689 | |
9690 | |
9691 /* Make sure that glyph rows in the current matrix of window W | |
9692 reference the same glyph memory as corresponding rows in the | |
9693 frame's frame matrix. This function is called after scrolling W's | |
9694 current matrix on a terminal frame in try_window_id and | |
9695 try_window_reusing_current_matrix. */ | |
9696 | |
9697 static void | |
9698 sync_frame_with_window_matrix_rows (w) | |
9699 struct window *w; | |
9700 { | |
9701 struct frame *f = XFRAME (w->frame); | |
9702 struct glyph_row *window_row, *window_row_end, *frame_row; | |
9703 | |
9704 /* Preconditions: W must be a leaf window and full-width. Its frame | |
9705 must have a frame matrix. */ | |
9706 xassert (NILP (w->hchild) && NILP (w->vchild)); | |
9707 xassert (WINDOW_FULL_WIDTH_P (w)); | |
9708 xassert (!FRAME_WINDOW_P (f)); | |
9709 | |
9710 /* If W is a full-width window, glyph pointers in W's current matrix | |
9711 have, by definition, to be the same as glyph pointers in the | |
9712 corresponding frame matrix. */ | |
9713 window_row = w->current_matrix->rows; | |
9714 window_row_end = window_row + w->current_matrix->nrows; | |
9715 frame_row = f->current_matrix->rows + XFASTINT (w->top); | |
9716 while (window_row < window_row_end) | |
9717 { | |
9718 int area; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9719 |
25012 | 9720 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
9721 frame_row->glyphs[area] = window_row->glyphs[area]; | |
25778
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9722 |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9723 /* Disable frame rows whose corresponding window rows have |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9724 been disabled in try_window_id. */ |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9725 if (!window_row->enabled_p) |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9726 frame_row->enabled_p = 0; |
9a6099957160
(sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents:
25777
diff
changeset
|
9727 |
25012 | 9728 ++window_row, ++frame_row; |
9729 } | |
9730 } | |
9731 | |
9732 | |
25543 | 9733 /* Find the glyph row in window W containing CHARPOS. Consider all |
9734 rows between START and END (not inclusive). END null means search | |
9735 all rows to the end of the display area of W. Value is the row | |
9736 containing CHARPOS or null. */ | |
9737 | |
9738 static struct glyph_row * | |
9739 row_containing_pos (w, charpos, start, end) | |
9740 struct window *w; | |
9741 int charpos; | |
9742 struct glyph_row *start, *end; | |
9743 { | |
9744 struct glyph_row *row = start; | |
9745 int last_y; | |
9746 | |
9747 /* If we happen to start on a header-line, skip that. */ | |
9748 if (row->mode_line_p) | |
9749 ++row; | |
9750 | |
9751 if ((end && row >= end) || !row->enabled_p) | |
9752 return NULL; | |
9753 | |
9754 last_y = window_text_bottom_y (w); | |
9755 | |
9756 while ((end == NULL || row < end) | |
9757 && (MATRIX_ROW_END_CHARPOS (row) < charpos | |
9758 /* The end position of a row equals the start | |
9759 position of the next row. If CHARPOS is there, we | |
9760 would rather display it in the next line, except | |
9761 when this line ends in ZV. */ | |
9762 || (MATRIX_ROW_END_CHARPOS (row) == charpos | |
9763 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
9764 || !row->ends_at_zv_p))) | |
9765 && MATRIX_ROW_BOTTOM_Y (row) < last_y) | |
9766 ++row; | |
9767 | |
9768 /* Give up if CHARPOS not found. */ | |
9769 if ((end && row >= end) | |
9770 || charpos < MATRIX_ROW_START_CHARPOS (row) | |
9771 || charpos > MATRIX_ROW_END_CHARPOS (row)) | |
9772 row = NULL; | |
9773 | |
9774 return row; | |
9775 } | |
9776 | |
9777 | |
25012 | 9778 /* Try to redisplay window W by reusing its existing display. W's |
9779 current matrix must be up to date when this function is called, | |
9780 i.e. window_end_valid must not be nil. | |
9781 | |
9782 Value is | |
9783 | |
9784 1 if display has been updated | |
9785 0 if otherwise unsuccessful | |
9786 -1 if redisplay with same window start is known not to succeed | |
9787 | |
9788 The following steps are performed: | |
9789 | |
9790 1. Find the last row in the current matrix of W that is not | |
9791 affected by changes at the start of current_buffer. If no such row | |
9792 is found, give up. | |
9793 | |
9794 2. Find the first row in W's current matrix that is not affected by | |
9795 changes at the end of current_buffer. Maybe there is no such row. | |
9796 | |
9797 3. Display lines beginning with the row + 1 found in step 1 to the | |
9798 row found in step 2 or, if step 2 didn't find a row, to the end of | |
9799 the window. | |
9800 | |
9801 4. If cursor is not known to appear on the window, give up. | |
9802 | |
9803 5. If display stopped at the row found in step 2, scroll the | |
9804 display and current matrix as needed. | |
9805 | |
9806 6. Maybe display some lines at the end of W, if we must. This can | |
9807 happen under various circumstances, like a partially visible line | |
9808 becoming fully visible, or because newly displayed lines are displayed | |
9809 in smaller font sizes. | |
9810 | |
9811 7. Update W's window end information. */ | |
9812 | |
9813 /* Check that window end is what we expect it to be. */ | |
277 | 9814 |
9815 static int | |
25012 | 9816 try_window_id (w) |
9817 struct window *w; | |
9818 { | |
9819 struct frame *f = XFRAME (w->frame); | |
9820 struct glyph_matrix *current_matrix = w->current_matrix; | |
9821 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
9822 struct glyph_row *last_unchanged_at_beg_row; | |
9823 struct glyph_row *first_unchanged_at_end_row; | |
9824 struct glyph_row *row; | |
9825 struct glyph_row *bottom_row; | |
9826 int bottom_vpos; | |
9827 struct it it; | |
9828 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; | |
9829 struct text_pos start_pos; | |
9830 struct run run; | |
9831 int first_unchanged_at_end_vpos = 0; | |
9832 struct glyph_row *last_text_row, *last_text_row_at_end; | |
9833 struct text_pos start; | |
9834 | |
9835 SET_TEXT_POS_FROM_MARKER (start, w->start); | |
9836 | |
9837 /* Check pre-conditions. Window end must be valid, otherwise | |
9838 the current matrix would not be up to date. */ | |
9839 xassert (!NILP (w->window_end_valid)); | |
9840 xassert (FRAME_WINDOW_P (XFRAME (w->frame)) | |
9841 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w))); | |
9842 | |
9843 /* Make sure beg_unchanged and end_unchanged are up to date. Do it | |
9844 only if buffer has really changed. The reason is that the gap is | |
9845 initially at Z for freshly visited files. The code below would | |
9846 set end_unchanged to 0 in that case. */ | |
9847 if (MODIFF > SAVE_MODIFF) | |
9848 { | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9849 if (GPT - BEG < BEG_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9850 BEG_UNCHANGED = GPT - BEG; |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9851 if (Z - GPT < END_UNCHANGED) |
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9852 END_UNCHANGED = Z - GPT; |
25012 | 9853 } |
9854 | |
9855 /* If window starts after a line end, and the last change is in | |
9856 front of that newline, then changes don't affect the display. | |
9857 This case happens with stealth-fontification. */ | |
9858 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); | |
9859 if (CHARPOS (start) > BEGV | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9860 && Z - END_UNCHANGED < CHARPOS (start) - 1 |
25012 | 9861 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n' |
9862 && PT < MATRIX_ROW_END_CHARPOS (row)) | |
9863 { | |
9864 /* We have to update window end positions because the buffer's | |
9865 size has changed. */ | |
9866 w->window_end_pos | |
9867 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
9868 w->window_end_bytepos | |
9869 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row)); | |
9870 return 1; | |
9871 } | |
9872 | |
9873 /* Return quickly if changes are all below what is displayed in the | |
9874 window, and if PT is in the window. */ | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9875 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row) |
25012 | 9876 && PT < MATRIX_ROW_END_CHARPOS (row)) |
9877 { | |
9878 /* We have to update window end positions because the buffer's | |
9879 size has changed. */ | |
9880 w->window_end_pos | |
9881 = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); | |
9882 w->window_end_bytepos | |
9883 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row)); | |
9884 return 1; | |
9885 } | |
9886 | |
9887 /* Check that window start agrees with the start of the first glyph | |
9888 row in its current matrix. Check this after we know the window | |
9889 start is not in changed text, otherwise positions would not be | |
9890 comparable. */ | |
9891 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); | |
9892 if (!TEXT_POS_EQUAL_P (start, row->start.pos)) | |
9893 return 0; | |
9894 | |
9895 /* Compute the position at which we have to start displaying new | |
9896 lines. Some of the lines at the top of the window might be | |
9897 reusable because they are not displaying changed text. Find the | |
9898 last row in W's current matrix not affected by changes at the | |
9899 start of current_buffer. Value is null if changes start in the | |
9900 first line of window. */ | |
9901 last_unchanged_at_beg_row = get_last_unchanged_at_beg_row (w); | |
9902 if (last_unchanged_at_beg_row) | |
9903 { | |
9904 init_to_row_end (&it, w, last_unchanged_at_beg_row); | |
9905 start_pos = it.current.pos; | |
9906 | |
9907 /* Start displaying new lines in the desired matrix at the same | |
9908 vpos we would use in the current matrix, i.e. below | |
9909 last_unchanged_at_beg_row. */ | |
9910 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row, | |
9911 current_matrix); | |
9912 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
9913 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row); | |
9914 | |
9915 xassert (it.hpos == 0 && it.current_x == 0); | |
9916 } | |
277 | 9917 else |
25012 | 9918 { |
9919 /* There are no reusable lines at the start of the window. | |
9920 Start displaying in the first line. */ | |
9921 start_display (&it, w, start); | |
9922 start_pos = it.current.pos; | |
9923 } | |
9924 | |
9925 /* Find the first row that is not affected by changes at the end of | |
9926 the buffer. Value will be null if there is no unchanged row, in | |
9927 which case we must redisplay to the end of the window. delta | |
9928 will be set to the value by which buffer positions beginning with | |
9929 first_unchanged_at_end_row have to be adjusted due to text | |
9930 changes. */ | |
9931 first_unchanged_at_end_row | |
9932 = get_first_unchanged_at_end_row (w, &delta, &delta_bytes); | |
9933 IF_DEBUG (debug_delta = delta); | |
9934 IF_DEBUG (debug_delta_bytes = delta_bytes); | |
9935 | |
9936 /* Set stop_pos to the buffer position up to which we will have to | |
9937 display new lines. If first_unchanged_at_end_row != NULL, this | |
9938 is the buffer position of the start of the line displayed in that | |
9939 row. For first_unchanged_at_end_row == NULL, use 0 to indicate | |
9940 that we don't stop at a buffer position. */ | |
9941 stop_pos = 0; | |
9942 if (first_unchanged_at_end_row) | |
9943 { | |
9944 xassert (last_unchanged_at_beg_row == NULL | |
9945 || first_unchanged_at_end_row >= last_unchanged_at_beg_row); | |
9946 | |
9947 /* If this is a continuation line, move forward to the next one | |
9948 that isn't. Changes in lines above affect this line. | |
9949 Caution: this may move first_unchanged_at_end_row to a row | |
9950 not displaying text. */ | |
9951 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row) | |
9952 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
9953 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
9954 < it.last_visible_y)) | |
9955 ++first_unchanged_at_end_row; | |
9956 | |
9957 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row) | |
9958 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row) | |
9959 >= it.last_visible_y)) | |
9960 first_unchanged_at_end_row = NULL; | |
9961 else | |
9962 { | |
9963 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row) | |
9964 + delta); | |
9965 first_unchanged_at_end_vpos | |
9966 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, current_matrix); | |
25377
d32d09a601e8
(redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents:
25362
diff
changeset
|
9967 xassert (stop_pos >= Z - END_UNCHANGED); |
25012 | 9968 } |
9969 } | |
9970 else if (last_unchanged_at_beg_row == NULL) | |
9971 return 0; | |
9972 | |
9973 | |
9974 #if GLYPH_DEBUG | |
9975 | |
9976 /* Either there is no unchanged row at the end, or the one we have | |
9977 now displays text. This is a necessary condition for the window | |
9978 end pos calculation at the end of this function. */ | |
9979 xassert (first_unchanged_at_end_row == NULL | |
9980 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)); | |
9981 | |
9982 debug_last_unchanged_at_beg_vpos | |
9983 = (last_unchanged_at_beg_row | |
9984 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix) | |
9985 : -1); | |
9986 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos; | |
9987 | |
9988 #endif /* GLYPH_DEBUG != 0 */ | |
9989 | |
9990 | |
9991 /* Display new lines. Set last_text_row to the last new line | |
9992 displayed which has text on it, i.e. might end up as being the | |
9993 line where the window_end_vpos is. */ | |
9994 w->cursor.vpos = -1; | |
9995 last_text_row = NULL; | |
277 | 9996 overlay_arrow_seen = 0; |
25012 | 9997 while (it.current_y < it.last_visible_y |
9998 && !fonts_changed_p | |
9999 && (first_unchanged_at_end_row == NULL | |
10000 || IT_CHARPOS (it) < stop_pos)) | |
10001 { | |
10002 if (display_line (&it)) | |
10003 last_text_row = it.glyph_row - 1; | |
10004 } | |
10005 | |
10006 if (fonts_changed_p) | |
10007 return -1; | |
10008 | |
10009 | |
10010 /* Compute differences in buffer positions, y-positions etc. for | |
10011 lines reused at the bottom of the window. Compute what we can | |
10012 scroll. */ | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10013 if (first_unchanged_at_end_row |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10014 /* No lines reused because we displayed everything up to the |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10015 bottom of the window. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10016 && it.current_y < it.last_visible_y) |
25012 | 10017 { |
10018 dvpos = (it.vpos | |
10019 - MATRIX_ROW_VPOS (first_unchanged_at_end_row, | |
10020 current_matrix)); | |
10021 dy = it.current_y - first_unchanged_at_end_row->y; | |
10022 run.current_y = first_unchanged_at_end_row->y; | |
10023 run.desired_y = run.current_y + dy; | |
10024 run.height = it.last_visible_y - max (run.current_y, run.desired_y); | |
10025 } | |
10026 else | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10027 { |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10028 delta = dvpos = dy = run.current_y = run.desired_y = run.height = 0; |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10029 first_unchanged_at_end_row = NULL; |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10030 } |
25012 | 10031 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy); |
10032 | |
25394
ed9fe1a2c8ae
(try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents:
25393
diff
changeset
|
10033 |
25012 | 10034 /* Find the cursor if not already found. We have to decide whether |
10035 PT will appear on this window (it sometimes doesn't, but this is | |
10036 not a very frequent case.) This decision has to be made before | |
10037 the current matrix is altered. A value of cursor.vpos < 0 means | |
10038 that PT is either in one of the lines beginning at | |
10039 first_unchanged_at_end_row or below the window. Don't care for | |
10040 lines that might be displayed later at the window end; as | |
10041 mentioned, this is not a frequent case. */ | |
10042 if (w->cursor.vpos < 0) | |
10043 { | |
10044 /* Cursor in unchanged rows at the top? */ | |
10045 if (PT < CHARPOS (start_pos) | |
10046 && last_unchanged_at_beg_row) | |
10047 { | |
25543 | 10048 row = row_containing_pos (w, PT, |
10049 MATRIX_FIRST_TEXT_ROW (w->current_matrix), | |
10050 last_unchanged_at_beg_row + 1); | |
10051 xassert (row && row <= last_unchanged_at_beg_row); | |
25012 | 10052 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
10053 } | |
10054 | |
10055 /* Start from first_unchanged_at_end_row looking for PT. */ | |
10056 else if (first_unchanged_at_end_row) | |
10057 { | |
25543 | 10058 row = row_containing_pos (w, PT - delta, |
10059 first_unchanged_at_end_row, NULL); | |
10060 if (row) | |
25393
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
10061 set_cursor_from_row (w, row, w->current_matrix, delta, |
9aff86718a20
(try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents:
25388
diff
changeset
|
10062 delta_bytes, dy, dvpos); |
25012 | 10063 } |
10064 | |
10065 /* Give up if cursor was not found. */ | |
10066 if (w->cursor.vpos < 0) | |
10067 { | |
10068 clear_glyph_matrix (w->desired_matrix); | |
10069 return -1; | |
10070 } | |
10071 } | |
10072 | |
10073 /* Don't let the cursor end in the scroll margins. */ | |
10074 { | |
10075 int this_scroll_margin, cursor_height; | |
10076 | |
10077 this_scroll_margin = max (0, scroll_margin); | |
10078 this_scroll_margin = min (this_scroll_margin, | |
10079 XFASTINT (w->height) / 4); | |
10080 this_scroll_margin *= CANON_Y_UNIT (it.f); | |
10081 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; | |
10082 | |
10083 if ((w->cursor.y < this_scroll_margin | |
10084 && CHARPOS (start) > BEGV) | |
10085 /* Don't take scroll margin into account at the bottom because | |
10086 old redisplay didn't do it either. */ | |
10087 || w->cursor.y + cursor_height > it.last_visible_y) | |
10088 { | |
10089 w->cursor.vpos = -1; | |
10090 clear_glyph_matrix (w->desired_matrix); | |
10091 return -1; | |
10092 } | |
10093 } | |
10094 | |
10095 /* Scroll the display. Do it before changing the current matrix so | |
10096 that xterm.c doesn't get confused about where the cursor glyph is | |
10097 found. */ | |
10098 if (dy) | |
10099 { | |
10100 update_begin (f); | |
10101 | |
10102 if (FRAME_WINDOW_P (f)) | |
10103 { | |
10104 rif->update_window_begin_hook (w); | |
10105 rif->scroll_run_hook (w, &run); | |
10106 rif->update_window_end_hook (w, 0); | |
10107 } | |
10108 else | |
10109 { | |
10110 /* Terminal frame. In this case, dvpos gives the number of | |
10111 lines to scroll by; dvpos < 0 means scroll up. */ | |
10112 int first_unchanged_at_end_vpos | |
10113 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix); | |
10114 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos; | |
10115 int end = XFASTINT (w->top) + window_internal_height (w); | |
10116 | |
10117 /* Perform the operation on the screen. */ | |
10118 if (dvpos > 0) | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
10119 { |
25012 | 10120 /* Scroll last_unchanged_at_beg_row to the end of the |
10121 window down dvpos lines. */ | |
10122 set_terminal_window (end); | |
10123 | |
10124 /* On dumb terminals delete dvpos lines at the end | |
10125 before inserting dvpos empty lines. */ | |
10126 if (!scroll_region_ok) | |
10127 ins_del_lines (end - dvpos, -dvpos); | |
10128 | |
10129 /* Insert dvpos empty lines in front of | |
10130 last_unchanged_at_beg_row. */ | |
10131 ins_del_lines (from, dvpos); | |
10132 } | |
10133 else if (dvpos < 0) | |
10134 { | |
10135 /* Scroll up last_unchanged_at_beg_vpos to the end of | |
10136 the window to last_unchanged_at_beg_vpos - |dvpos|. */ | |
10137 set_terminal_window (end); | |
10138 | |
10139 /* Delete dvpos lines in front of | |
10140 last_unchanged_at_beg_vpos. ins_del_lines will set | |
10141 the cursor to the given vpos and emit |dvpos| delete | |
10142 line sequences. */ | |
10143 ins_del_lines (from + dvpos, dvpos); | |
10144 | |
10145 /* On a dumb terminal insert dvpos empty lines at the | |
10146 end. */ | |
10147 if (!scroll_region_ok) | |
10148 ins_del_lines (end + dvpos, -dvpos); | |
6684
b5dc04567426
(display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents:
6661
diff
changeset
|
10149 } |
25012 | 10150 |
10151 set_terminal_window (0); | |
10152 } | |
10153 | |
10154 update_end (f); | |
10155 } | |
10156 | |
25493
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10157 /* Shift reused rows of the current matrix to the right position. |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10158 BOTTOM_ROW is the last + 1 row in the current matrix reserved for |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10159 text. */ |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10160 bottom_row = MATRIX_BOTTOM_TEXT_ROW (current_matrix, w); |
28588533d342
(try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents:
25463
diff
changeset
|
10161 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix); |
25012 | 10162 if (dvpos < 0) |
10163 { | |
10164 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos, | |
10165 bottom_vpos, dvpos); | |
10166 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos, | |
10167 bottom_vpos, 0); | |
10168 } | |
10169 else if (dvpos > 0) | |
10170 { | |
10171 rotate_matrix (current_matrix, first_unchanged_at_end_vpos, | |
10172 bottom_vpos, dvpos); | |
10173 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos, | |
10174 first_unchanged_at_end_vpos + dvpos, 0); | |
10175 } | |
10176 | |
10177 /* For frame-based redisplay, make sure that current frame and window | |
10178 matrix are in sync with respect to glyph memory. */ | |
10179 if (!FRAME_WINDOW_P (f)) | |
10180 sync_frame_with_window_matrix_rows (w); | |
10181 | |
10182 /* Adjust buffer positions in reused rows. */ | |
10183 if (delta) | |
10184 increment_glyph_matrix_buffer_positions (current_matrix, | |
10185 first_unchanged_at_end_vpos + dvpos, | |
10186 bottom_vpos, delta, delta_bytes); | |
10187 | |
10188 /* Adjust Y positions. */ | |
10189 if (dy) | |
10190 shift_glyph_matrix (w, current_matrix, | |
10191 first_unchanged_at_end_vpos + dvpos, | |
10192 bottom_vpos, dy); | |
10193 | |
10194 if (first_unchanged_at_end_row) | |
10195 first_unchanged_at_end_row += dvpos; | |
10196 | |
10197 /* If scrolling up, there may be some lines to display at the end of | |
10198 the window. */ | |
10199 last_text_row_at_end = NULL; | |
10200 if (dy < 0) | |
10201 { | |
10202 /* Set last_row to the glyph row in the current matrix where the | |
10203 window end line is found. It has been moved up or down in | |
10204 the matrix by dvpos. */ | |
10205 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos; | |
10206 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos); | |
10207 | |
10208 /* If last_row is the window end line, it should display text. */ | |
10209 xassert (last_row->displays_text_p); | |
10210 | |
10211 /* If window end line was partially visible before, begin | |
10212 displaying at that line. Otherwise begin displaying with the | |
10213 line following it. */ | |
10214 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y) | |
10215 { | |
10216 init_to_row_start (&it, w, last_row); | |
10217 it.vpos = last_vpos; | |
10218 it.current_y = last_row->y; | |
10219 } | |
10220 else | |
10221 { | |
10222 init_to_row_end (&it, w, last_row); | |
10223 it.vpos = 1 + last_vpos; | |
10224 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row); | |
10225 ++last_row; | |
10226 } | |
10227 | |
10228 /* We may start in a continuation line. If so, we have to get | |
10229 the right continuation_lines_width and current_x. */ | |
10230 it.continuation_lines_width = last_row->continuation_lines_width; | |
10231 it.hpos = it.current_x = 0; | |
10232 | |
10233 /* Display the rest of the lines at the window end. */ | |
10234 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos); | |
10235 while (it.current_y < it.last_visible_y | |
10236 && !fonts_changed_p) | |
10237 { | |
10238 /* Is it always sure that the display agrees with lines in | |
10239 the current matrix? I don't think so, so we mark rows | |
10240 displayed invalid in the current matrix by setting their | |
10241 enabled_p flag to zero. */ | |
10242 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0; | |
10243 if (display_line (&it)) | |
10244 last_text_row_at_end = it.glyph_row - 1; | |
10245 } | |
10246 } | |
10247 | |
10248 /* Update window_end_pos and window_end_vpos. */ | |
10249 if (first_unchanged_at_end_row | |
10250 && first_unchanged_at_end_row->y < it.last_visible_y | |
10251 && !last_text_row_at_end) | |
10252 { | |
10253 /* Window end line if one of the preserved rows from the current | |
10254 matrix. Set row to the last row displaying text in current | |
10255 matrix starting at first_unchanged_at_end_row, after | |
10256 scrolling. */ | |
10257 xassert (first_unchanged_at_end_row->displays_text_p); | |
10258 row = find_last_row_displaying_text (w->current_matrix, &it, | |
10259 first_unchanged_at_end_row); | |
10260 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row)); | |
10261 | |
10262 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row)); | |
10263 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); | |
10264 XSETFASTINT (w->window_end_vpos, | |
10265 MATRIX_ROW_VPOS (row, w->current_matrix)); | |
10266 } | |
10267 else if (last_text_row_at_end) | |
10268 { | |
10269 XSETFASTINT (w->window_end_pos, | |
10270 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)); | |
10271 w->window_end_bytepos | |
10272 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); | |
10273 XSETFASTINT (w->window_end_vpos, | |
10274 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); | |
10275 } | |
10276 else if (last_text_row) | |
10277 { | |
10278 /* We have displayed either to the end of the window or at the | |
10279 end of the window, i.e. the last row with text is to be found | |
10280 in the desired matrix. */ | |
10281 XSETFASTINT (w->window_end_pos, | |
10282 Z - MATRIX_ROW_END_CHARPOS (last_text_row)); | |
10283 w->window_end_bytepos | |
10284 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); | |
10285 XSETFASTINT (w->window_end_vpos, | |
10286 MATRIX_ROW_VPOS (last_text_row, desired_matrix)); | |
10287 } | |
10288 else if (first_unchanged_at_end_row == NULL | |
10289 && last_text_row == NULL | |
10290 && last_text_row_at_end == NULL) | |
10291 { | |
10292 /* Displayed to end of window, but no line containing text was | |
10293 displayed. Lines were deleted at the end of the window. */ | |
10294 int vpos; | |
25546 | 10295 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; |
25012 | 10296 |
10297 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos) | |
25546 | 10298 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p |
10299 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p) | |
10300 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p | |
10301 && w->current_matrix->rows[vpos + header_line_p].displays_text_p)) | |
25012 | 10302 break; |
10303 | |
10304 w->window_end_vpos = make_number (vpos); | |
10305 } | |
10306 else | |
10307 abort (); | |
10308 | |
10309 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); | |
10310 debug_end_vpos = XFASTINT (w->window_end_vpos)); | |
10311 | |
10312 /* Record that display has not been completed. */ | |
277 | 10313 w->window_end_valid = Qnil; |
25012 | 10314 w->desired_matrix->no_scrolling_p = 1; |
277 | 10315 return 1; |
10316 } | |
25012 | 10317 |
10318 | |
10319 | |
10320 /*********************************************************************** | |
10321 More debugging support | |
10322 ***********************************************************************/ | |
10323 | |
10324 #if GLYPH_DEBUG | |
10325 | |
10326 void dump_glyph_row P_ ((struct glyph_matrix *, int, int)); | |
10327 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); | |
10328 | |
10329 | |
10330 /* Dump the contents of glyph matrix MATRIX on stderr. If | |
10331 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */ | |
10332 | |
10333 void | |
10334 dump_glyph_matrix (matrix, with_glyphs_p) | |
10335 struct glyph_matrix *matrix; | |
10336 int with_glyphs_p; | |
10337 { | |
10338 int i; | |
10339 for (i = 0; i < matrix->nrows; ++i) | |
10340 dump_glyph_row (matrix, i, with_glyphs_p); | |
10341 } | |
10342 | |
10343 | |
10344 /* Dump the contents of glyph row at VPOS in MATRIX to stderr. | |
10345 WITH_GLYPH_SP non-zero means dump glyph contents, too. */ | |
10346 | |
10347 void | |
10348 dump_glyph_row (matrix, vpos, with_glyphs_p) | |
10349 struct glyph_matrix *matrix; | |
10350 int vpos, with_glyphs_p; | |
10351 { | |
10352 struct glyph_row *row; | |
10353 | |
10354 if (vpos < 0 || vpos >= matrix->nrows) | |
10355 return; | |
10356 | |
10357 row = MATRIX_ROW (matrix, vpos); | |
10358 | |
10359 fprintf (stderr, "Row Start End Used oEI><O\\CTZF X Y W\n"); | |
10360 fprintf (stderr, "=============================================\n"); | |
10361 | |
10362 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d\n", | |
10363 row - matrix->rows, | |
10364 MATRIX_ROW_START_CHARPOS (row), | |
10365 MATRIX_ROW_END_CHARPOS (row), | |
10366 row->used[TEXT_AREA], | |
10367 row->contains_overlapping_glyphs_p, | |
10368 row->enabled_p, | |
10369 row->inverse_p, | |
10370 row->truncated_on_left_p, | |
10371 row->truncated_on_right_p, | |
10372 row->overlay_arrow_p, | |
10373 row->continued_p, | |
10374 MATRIX_ROW_CONTINUATION_LINE_P (row), | |
10375 row->displays_text_p, | |
10376 row->ends_at_zv_p, | |
10377 row->fill_line_p, | |
10378 row->x, | |
10379 row->y, | |
10380 row->pixel_width); | |
10381 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index, | |
10382 row->end.overlay_string_index); | |
10383 fprintf (stderr, "%9d %5d\n", | |
10384 CHARPOS (row->start.string_pos), | |
10385 CHARPOS (row->end.string_pos)); | |
10386 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index, | |
10387 row->end.dpvec_index); | |
10388 | |
10389 if (with_glyphs_p) | |
10390 { | |
10391 struct glyph *glyph, *glyph_end; | |
10392 int prev_had_glyphs_p; | |
10393 | |
10394 glyph = row->glyphs[TEXT_AREA]; | |
10395 glyph_end = glyph + row->used[TEXT_AREA]; | |
10396 | |
10397 /* Glyph for a line end in text. */ | |
10398 if (glyph == glyph_end && glyph->charpos > 0) | |
10399 ++glyph_end; | |
10400 | |
10401 if (glyph < glyph_end) | |
10402 { | |
10403 fprintf (stderr, " Glyph Type Pos W Code C Face LR\n"); | |
10404 prev_had_glyphs_p = 1; | |
10405 } | |
10406 else | |
10407 prev_had_glyphs_p = 0; | |
10408 | |
10409 while (glyph < glyph_end) | |
10410 { | |
10411 if (glyph->type == CHAR_GLYPH) | |
10412 { | |
10413 fprintf (stderr, | |
10414 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10415 glyph - row->glyphs[TEXT_AREA], | |
10416 'C', | |
10417 glyph->charpos, | |
10418 glyph->pixel_width, | |
10419 glyph->u.ch.code, | |
10420 (glyph->u.ch.code < 0x80 && glyph->u.ch.code >= ' ' | |
10421 ? glyph->u.ch.code | |
10422 : '.'), | |
10423 glyph->u.ch.face_id, | |
10424 glyph->left_box_line_p, | |
10425 glyph->right_box_line_p); | |
10426 } | |
10427 else if (glyph->type == STRETCH_GLYPH) | |
10428 { | |
10429 fprintf (stderr, | |
10430 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10431 glyph - row->glyphs[TEXT_AREA], | |
10432 'S', | |
10433 glyph->charpos, | |
10434 glyph->pixel_width, | |
10435 0, | |
10436 '.', | |
10437 glyph->u.stretch.face_id, | |
10438 glyph->left_box_line_p, | |
10439 glyph->right_box_line_p); | |
10440 } | |
10441 else if (glyph->type == IMAGE_GLYPH) | |
10442 { | |
10443 fprintf (stderr, | |
10444 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n", | |
10445 glyph - row->glyphs[TEXT_AREA], | |
10446 'I', | |
10447 glyph->charpos, | |
10448 glyph->pixel_width, | |
10449 glyph->u.img.id, | |
10450 '.', | |
10451 glyph->u.img.face_id, | |
10452 glyph->left_box_line_p, | |
10453 glyph->right_box_line_p); | |
10454 } | |
10455 ++glyph; | |
10456 } | |
10457 } | |
10458 } | |
10459 | |
10460 | |
10461 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |
10462 Sdump_glyph_matrix, 0, 1, "p", | |
10463 "Dump the current matrix of the selected window to stderr.\n\ | |
10464 Shows contents of glyph row structures. With non-nil optional\n\ | |
10465 parameter WITH-GLYPHS-P, dump glyphs as well.") | |
10466 (with_glyphs_p) | |
10467 { | |
10468 struct window *w = XWINDOW (selected_window); | |
10469 struct buffer *buffer = XBUFFER (w->buffer); | |
10470 | |
10471 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n", | |
10472 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); | |
10473 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", | |
10474 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); | |
10475 fprintf (stderr, "=============================================\n"); | |
10476 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p)); | |
10477 return Qnil; | |
10478 } | |
10479 | |
10480 | |
10481 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "", | |
10482 "Dump glyph row ROW to stderr.") | |
10483 (row) | |
10484 Lisp_Object row; | |
10485 { | |
10486 CHECK_NUMBER (row, 0); | |
10487 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1); | |
10488 return Qnil; | |
10489 } | |
10490 | |
10491 | |
25543 | 10492 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, |
25012 | 10493 0, 0, "", "") |
10494 () | |
10495 { | |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
10496 struct frame *sf = SELECTED_FRAME (); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
10497 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) |
25012 | 10498 ->current_matrix); |
10499 dump_glyph_row (m, 0, 1); | |
10500 return Qnil; | |
10501 } | |
10502 | |
10503 | |
10504 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | |
10505 Strace_redisplay_toggle, 0, 0, "", | |
10506 "Toggle tracing of redisplay.") | |
10507 () | |
10508 { | |
10509 trace_redisplay_p = !trace_redisplay_p; | |
10510 return Qnil; | |
10511 } | |
10512 | |
10513 | |
10514 #endif /* GLYPH_DEBUG */ | |
10515 | |
10516 | |
277 | 10517 |
25012 | 10518 /*********************************************************************** |
10519 Building Desired Matrix Rows | |
10520 ***********************************************************************/ | |
10521 | |
10522 /* Return a temporary glyph row holding the glyphs of an overlay | |
10523 arrow. Only used for non-window-redisplay windows. */ | |
10524 | |
10525 static struct glyph_row * | |
10526 get_overlay_arrow_glyph_row (w) | |
10527 struct window *w; | |
10528 { | |
10529 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
10530 struct buffer *buffer = XBUFFER (w->buffer); | |
10531 struct buffer *old = current_buffer; | |
10532 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data; | |
10533 int arrow_len = XSTRING (Voverlay_arrow_string)->size; | |
10534 unsigned char *arrow_end = arrow_string + arrow_len; | |
10535 unsigned char *p; | |
10536 struct it it; | |
10537 int multibyte_p; | |
10538 int n_glyphs_before; | |
10539 | |
10540 set_buffer_temp (buffer); | |
10541 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID); | |
10542 it.glyph_row->used[TEXT_AREA] = 0; | |
10543 SET_TEXT_POS (it.position, 0, 0); | |
10544 | |
10545 multibyte_p = !NILP (buffer->enable_multibyte_characters); | |
10546 p = arrow_string; | |
10547 while (p < arrow_end) | |
10548 { | |
10549 Lisp_Object face, ilisp; | |
10550 | |
10551 /* Get the next character. */ | |
10552 if (multibyte_p) | |
25096
1af1088d3812
(string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents:
25063
diff
changeset
|
10553 it.c = string_char_and_length (p, arrow_len, &it.len); |
25012 | 10554 else |
10555 it.c = *p, it.len = 1; | |
10556 p += it.len; | |
10557 | |
10558 /* Get its face. */ | |
10559 XSETFASTINT (ilisp, p - arrow_string); | |
10560 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string); | |
10561 it.face_id = compute_char_face (f, it.c, face); | |
10562 | |
10563 /* Compute its width, get its glyphs. */ | |
10564 n_glyphs_before = it.glyph_row->used[TEXT_AREA]; | |
25243
d74ff22998b4
(get_overlay_arrow_glyph_row): Set the charpos of
Gerd Moellmann <gerd@gnu.org>
parents:
25242
diff
changeset
|
10565 SET_TEXT_POS (it.position, -1, -1); |
25012 | 10566 PRODUCE_GLYPHS (&it); |
10567 | |
10568 /* If this character doesn't fit any more in the line, we have | |
10569 to remove some glyphs. */ | |
10570 if (it.current_x > it.last_visible_x) | |
10571 { | |
10572 it.glyph_row->used[TEXT_AREA] = n_glyphs_before; | |
10573 break; | |
10574 } | |
10575 } | |
10576 | |
10577 set_buffer_temp (old); | |
10578 return it.glyph_row; | |
10579 } | |
10580 | |
10581 | |
10582 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation | |
10583 glyphs are only inserted for terminal frames since we can't really | |
10584 win with truncation glyphs when partially visible glyphs are | |
10585 involved. Which glyphs to insert is determined by | |
10586 produce_special_glyphs. */ | |
10587 | |
10588 static void | |
10589 insert_left_trunc_glyphs (it) | |
10590 struct it *it; | |
10591 { | |
10592 struct it truncate_it; | |
10593 struct glyph *from, *end, *to, *toend; | |
10594 | |
10595 xassert (!FRAME_WINDOW_P (it->f)); | |
10596 | |
10597 /* Get the truncation glyphs. */ | |
10598 truncate_it = *it; | |
10599 truncate_it.charset = -1; | |
10600 truncate_it.current_x = 0; | |
10601 truncate_it.face_id = DEFAULT_FACE_ID; | |
10602 truncate_it.glyph_row = &scratch_glyph_row; | |
10603 truncate_it.glyph_row->used[TEXT_AREA] = 0; | |
10604 CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1; | |
10605 truncate_it.object = 0; | |
10606 produce_special_glyphs (&truncate_it, IT_TRUNCATION); | |
10607 | |
10608 /* Overwrite glyphs from IT with truncation glyphs. */ | |
10609 from = truncate_it.glyph_row->glyphs[TEXT_AREA]; | |
10610 end = from + truncate_it.glyph_row->used[TEXT_AREA]; | |
10611 to = it->glyph_row->glyphs[TEXT_AREA]; | |
10612 toend = to + it->glyph_row->used[TEXT_AREA]; | |
10613 | |
10614 while (from < end) | |
10615 *to++ = *from++; | |
10616 | |
10617 /* There may be padding glyphs left over. Remove them. */ | |
10618 from = to; | |
10619 while (from < toend && CHAR_GLYPH_PADDING_P (*from)) | |
10620 ++from; | |
10621 while (from < toend) | |
10622 *to++ = *from++; | |
10623 | |
10624 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA]; | |
10625 } | |
10626 | |
10627 | |
10628 /* Compute the pixel height and width of IT->glyph_row. | |
10629 | |
10630 Most of the time, ascent and height of a display line will be equal | |
10631 to the max_ascent and max_height values of the display iterator | |
10632 structure. This is not the case if | |
10633 | |
10634 1. We hit ZV without displaying anything. In this case, max_ascent | |
10635 and max_height will be zero. | |
10636 | |
10637 2. We have some glyphs that don't contribute to the line height. | |
10638 (The glyph row flag contributes_to_line_height_p is for future | |
10639 pixmap extensions). | |
10640 | |
10641 The first case is easily covered by using default values because in | |
10642 these cases, the line height does not really matter, except that it | |
10643 must not be zero. */ | |
10644 | |
10645 static void | |
10646 compute_line_metrics (it) | |
10647 struct it *it; | |
10648 { | |
10649 struct glyph_row *row = it->glyph_row; | |
10650 int area, i; | |
10651 | |
10652 if (FRAME_WINDOW_P (it->f)) | |
10653 { | |
25546 | 10654 int i, header_line_height; |
25012 | 10655 |
10656 /* The line may consist of one space only, that was added to | |
10657 place the cursor on it. If so, the row's height hasn't been | |
10658 computed yet. */ | |
10659 if (row->height == 0) | |
10660 { | |
10661 if (it->max_ascent + it->max_descent == 0) | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10662 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f); |
25012 | 10663 row->ascent = it->max_ascent; |
10664 row->height = it->max_ascent + it->max_descent; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10665 row->phys_ascent = it->max_phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10666 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 10667 } |
10668 | |
10669 /* Compute the width of this line. */ | |
10670 row->pixel_width = row->x; | |
10671 for (i = 0; i < row->used[TEXT_AREA]; ++i) | |
10672 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width; | |
10673 | |
10674 xassert (row->pixel_width >= 0); | |
10675 xassert (row->ascent >= 0 && row->height > 0); | |
10676 | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10677 row->overlapping_p = (MATRIX_ROW_OVERLAPS_SUCC_P (row) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10678 || MATRIX_ROW_OVERLAPS_PRED_P (row)); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10679 |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10680 /* If first line's physical ascent is larger than its logical |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10681 ascent, use the physical ascent, and make the row taller. |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10682 This makes accented characters fully visible. */ |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10683 if (row == it->w->desired_matrix->rows |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10684 && row->phys_ascent > row->ascent) |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10685 { |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10686 row->height += row->phys_ascent - row->ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10687 row->ascent = row->phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10688 } |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10689 |
25012 | 10690 /* Compute how much of the line is visible. */ |
10691 row->visible_height = row->height; | |
10692 | |
25546 | 10693 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w); |
10694 if (row->y < header_line_height) | |
10695 row->visible_height -= header_line_height - row->y; | |
25012 | 10696 else |
10697 { | |
10698 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w); | |
10699 if (row->y + row->height > max_y) | |
10700 row->visible_height -= row->y + row->height - max_y; | |
10701 } | |
10702 } | |
6415
35917d3d0952
(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents:
6372
diff
changeset
|
10703 else |
25012 | 10704 { |
10705 row->pixel_width = row->used[TEXT_AREA]; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10706 row->ascent = row->phys_ascent = 0; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10707 row->height = row->phys_height = row->visible_height = 1; |
25012 | 10708 } |
10709 | |
10710 /* Compute a hash code for this row. */ | |
10711 row->hash = 0; | |
10712 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
10713 for (i = 0; i < row->used[area]; ++i) | |
10714 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) | |
10715 + row->glyphs[area][i].u.val | |
10716 + (row->glyphs[area][i].type << 2)); | |
10717 | |
10718 it->max_ascent = it->max_descent = 0; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10719 it->max_phys_ascent = it->max_phys_descent = 0; |
25012 | 10720 } |
10721 | |
10722 | |
10723 /* Append one space to the glyph row of iterator IT if doing a | |
10724 window-based redisplay. DEFAULT_FACE_P non-zero means let the | |
10725 space have the default face, otherwise let it have the same face as | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10726 IT->face_id. Value is non-zero if a space was added. |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10727 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10728 This function is called to make sure that there is always one glyph |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10729 at the end of a glyph row that the cursor can be set on under |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10730 window-systems. (If there weren't such a glyph we would not know |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10731 how wide and tall a box cursor should be displayed). |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10732 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10733 At the same time this space let's a nicely handle clearing to the |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
10734 end of the line if the row ends in italic text. */ |
25012 | 10735 |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10736 static int |
25012 | 10737 append_space (it, default_face_p) |
10738 struct it *it; | |
10739 int default_face_p; | |
10740 { | |
10741 if (FRAME_WINDOW_P (it->f)) | |
10742 { | |
10743 int n = it->glyph_row->used[TEXT_AREA]; | |
10744 | |
10745 if (it->glyph_row->glyphs[TEXT_AREA] + n | |
10746 < it->glyph_row->glyphs[1 + TEXT_AREA]) | |
10747 { | |
10748 /* Save some values that must not be changed. */ | |
10749 int saved_x = it->current_x; | |
10750 struct text_pos saved_pos; | |
10751 int saved_what = it->what; | |
10752 int saved_face_id = it->face_id; | |
10753 int saved_charset = it->charset; | |
10754 Lisp_Object saved_object; | |
10755 | |
10756 saved_object = it->object; | |
10757 saved_pos = it->position; | |
10758 | |
10759 it->what = IT_CHARACTER; | |
10760 bzero (&it->position, sizeof it->position); | |
10761 it->object = 0; | |
10762 it->c = ' '; | |
10763 it->len = 1; | |
10764 it->charset = CHARSET_ASCII; | |
10765 | |
10766 if (default_face_p) | |
10767 it->face_id = DEFAULT_FACE_ID; | |
10768 if (it->multibyte_p) | |
10769 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, CHARSET_ASCII); | |
10770 else | |
10771 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, -1); | |
10772 | |
10773 PRODUCE_GLYPHS (it); | |
10774 | |
10775 it->current_x = saved_x; | |
10776 it->object = saved_object; | |
10777 it->position = saved_pos; | |
10778 it->what = saved_what; | |
10779 it->face_id = saved_face_id; | |
10780 it->charset = saved_charset; | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10781 return 1; |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10782 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10783 } |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10784 |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
10785 return 0; |
25012 | 10786 } |
10787 | |
10788 | |
10789 /* Extend the face of the last glyph in the text area of IT->glyph_row | |
10790 to the end of the display line. Called from display_line. | |
10791 If the glyph row is empty, add a space glyph to it so that we | |
10792 know the face to draw. Set the glyph row flag fill_line_p. */ | |
10793 | |
10794 static void | |
10795 extend_face_to_end_of_line (it) | |
10796 struct it *it; | |
10797 { | |
10798 struct face *face; | |
10799 struct frame *f = it->f; | |
10800 | |
10801 /* If line is already filled, do nothing. */ | |
10802 if (it->current_x >= it->last_visible_x) | |
10803 return; | |
10804 | |
10805 /* Face extension extends the background and box of IT->face_id | |
10806 to the end of the line. If the background equals the background | |
10807 of the frame, we haven't to do anything. */ | |
10808 face = FACE_FROM_ID (f, it->face_id); | |
10809 if (FRAME_WINDOW_P (f) | |
10810 && face->box == FACE_NO_BOX | |
10811 && face->background == FRAME_BACKGROUND_PIXEL (f) | |
10812 && !face->stipple) | |
10813 return; | |
10814 | |
10815 /* Set the glyph row flag indicating that the face of the last glyph | |
10816 in the text area has to be drawn to the end of the text area. */ | |
10817 it->glyph_row->fill_line_p = 1; | |
10818 | |
10819 /* If current charset of IT is not ASCII, make sure we have the | |
10820 ASCII face. This will be automatically undone the next time | |
10821 get_next_display_element returns a character from a different | |
10822 charset. Note that the charset will always be ASCII in unibyte | |
10823 text. */ | |
10824 if (it->charset != CHARSET_ASCII) | |
10825 { | |
10826 it->charset = CHARSET_ASCII; | |
10827 it->face_id = FACE_FOR_CHARSET (f, it->face_id, CHARSET_ASCII); | |
10828 } | |
10829 | |
10830 if (FRAME_WINDOW_P (f)) | |
10831 { | |
10832 /* If the row is empty, add a space with the current face of IT, | |
10833 so that we know which face to draw. */ | |
10834 if (it->glyph_row->used[TEXT_AREA] == 0) | |
10835 { | |
10836 it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph; | |
10837 it->glyph_row->glyphs[TEXT_AREA][0].u.ch.face_id = it->face_id; | |
10838 it->glyph_row->used[TEXT_AREA] = 1; | |
10839 } | |
10840 } | |
10841 else | |
10842 { | |
10843 /* Save some values that must not be changed. */ | |
10844 int saved_x = it->current_x; | |
10845 struct text_pos saved_pos; | |
10846 Lisp_Object saved_object; | |
10847 int saved_what = it->what; | |
10848 | |
10849 saved_object = it->object; | |
10850 saved_pos = it->position; | |
10851 | |
10852 it->what = IT_CHARACTER; | |
10853 bzero (&it->position, sizeof it->position); | |
10854 it->object = 0; | |
10855 it->c = ' '; | |
10856 it->len = 1; | |
10857 | |
10858 PRODUCE_GLYPHS (it); | |
10859 | |
10860 while (it->current_x <= it->last_visible_x) | |
10861 PRODUCE_GLYPHS (it); | |
10862 | |
10863 /* Don't count these blanks really. It would let us insert a left | |
10864 truncation glyph below and make us set the cursor on them, maybe. */ | |
10865 it->current_x = saved_x; | |
10866 it->object = saved_object; | |
10867 it->position = saved_pos; | |
10868 it->what = saved_what; | |
10869 } | |
10870 } | |
10871 | |
10872 | |
10873 /* Value is non-zero if text starting at CHARPOS in current_buffer is | |
10874 trailing whitespace. */ | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
10875 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
10876 static int |
25012 | 10877 trailing_whitespace_p (charpos) |
10878 int charpos; | |
10879 { | |
10880 int bytepos = CHAR_TO_BYTE (charpos); | |
10881 int c = 0; | |
10882 | |
10883 while (bytepos < ZV_BYTE | |
10884 && (c = FETCH_CHAR (bytepos), | |
10885 c == ' ' || c == '\t')) | |
10886 ++bytepos; | |
10887 | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10888 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r') |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10889 { |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10890 if (bytepos != PT_BYTE) |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10891 return 1; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10892 } |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
10893 return 0; |
25012 | 10894 } |
10895 | |
10896 | |
10897 /* Highlight trailing whitespace, if any, in ROW. */ | |
10898 | |
10899 void | |
10900 highlight_trailing_whitespace (f, row) | |
10901 struct frame *f; | |
10902 struct glyph_row *row; | |
10903 { | |
10904 int used = row->used[TEXT_AREA]; | |
10905 | |
10906 if (used) | |
10907 { | |
10908 struct glyph *start = row->glyphs[TEXT_AREA]; | |
10909 struct glyph *glyph = start + used - 1; | |
10910 | |
10911 /* Skip over the space glyph inserted to display the | |
10912 cursor at the end of a line. */ | |
10913 if (glyph->type == CHAR_GLYPH | |
10914 && glyph->u.ch.code == ' ' | |
10915 && glyph->object == 0) | |
10916 --glyph; | |
10917 | |
10918 /* If last glyph is a space or stretch, and it's trailing | |
10919 whitespace, set the face of all trailing whitespace glyphs in | |
10920 IT->glyph_row to `trailing-whitespace'. */ | |
10921 if (glyph >= start | |
10922 && BUFFERP (glyph->object) | |
10923 && (glyph->type == STRETCH_GLYPH | |
10924 || (glyph->type == CHAR_GLYPH | |
10925 && glyph->u.ch.code == ' ')) | |
10926 && trailing_whitespace_p (glyph->charpos)) | |
10927 { | |
10928 int face_id = lookup_named_face (f, Qtrailing_whitespace, | |
10929 CHARSET_ASCII); | |
10930 | |
10931 while (glyph >= start | |
10932 && BUFFERP (glyph->object) | |
10933 && (glyph->type == STRETCH_GLYPH | |
10934 || (glyph->type == CHAR_GLYPH | |
10935 && glyph->u.ch.code == ' '))) | |
10936 { | |
10937 if (glyph->type == STRETCH_GLYPH) | |
10938 glyph->u.stretch.face_id = face_id; | |
10939 else | |
10940 glyph->u.ch.face_id = face_id; | |
10941 --glyph; | |
10942 } | |
10943 } | |
10944 } | |
10945 } | |
10946 | |
10947 | |
10948 /* Construct the glyph row IT->glyph_row in the desired matrix of | |
10949 IT->w from text at the current position of IT. See dispextern.h | |
10950 for an overview of struct it. Value is non-zero if | |
10951 IT->glyph_row displays text, as opposed to a line displaying ZV | |
10952 only. */ | |
10953 | |
10954 static int | |
10955 display_line (it) | |
10956 struct it *it; | |
10957 { | |
10958 struct glyph_row *row = it->glyph_row; | |
10959 | |
10960 /* We always start displaying at hpos zero even if hscrolled. */ | |
10961 xassert (it->hpos == 0 && it->current_x == 0); | |
10962 | |
10963 /* We must not display in a row that's not a text row. */ | |
10964 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix) | |
10965 < it->w->desired_matrix->nrows); | |
10966 | |
10967 /* Is IT->w showing the region? */ | |
10968 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil; | |
10969 | |
10970 /* Clear the result glyph row and enable it. */ | |
10971 prepare_desired_row (row); | |
10972 | |
10973 row->y = it->current_y; | |
10974 row->start = it->current; | |
10975 row->continuation_lines_width = it->continuation_lines_width; | |
10976 row->displays_text_p = 1; | |
277 | 10977 |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
10978 /* Arrange the overlays nicely for our purposes. Usually, we call |
25012 | 10979 display_line on only one line at a time, in which case this |
2766
aa7b6f6aa20a
* xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents:
2754
diff
changeset
|
10980 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
|
10981 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
|
10982 recenter_overlay_lists but the first will be pretty cheap. */ |
25012 | 10983 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it)); |
10984 | |
10985 /* Move over display elements that are not visible because we are | |
10986 hscrolled. This may stop at an x-position < IT->first_visible_x | |
10987 if the first glyph is partially visible or if we hit a line end. */ | |
10988 if (it->current_x < it->first_visible_x) | |
10989 move_it_in_display_line_to (it, ZV, it->first_visible_x, | |
10990 MOVE_TO_POS | MOVE_TO_X); | |
10991 | |
10992 /* Get the initial row height. This is either the height of the | |
10993 text hscrolled, if there is any, or zero. */ | |
10994 row->ascent = it->max_ascent; | |
10995 row->height = it->max_ascent + it->max_descent; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10996 row->phys_ascent = it->max_phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
10997 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 10998 |
10999 /* Loop generating characters. The loop is left with IT on the next | |
11000 character to display. */ | |
11001 while (1) | |
11002 { | |
11003 int n_glyphs_before, hpos_before, x_before; | |
11004 int x, i, nglyphs; | |
11005 | |
11006 /* Retrieve the next thing to display. Value is zero if end of | |
11007 buffer reached. */ | |
11008 if (!get_next_display_element (it)) | |
11009 { | |
11010 /* Maybe add a space at the end of this line that is used to | |
11011 display the cursor there under X. */ | |
26255
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11012 if (append_space (it, 1) && row->used[TEXT_AREA] == 1) |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11013 { |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11014 /* The position -1 below indicates a blank line not |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11015 corresponding to any text, as opposed to an empty line |
4ebced8747b7
(append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents:
26203
diff
changeset
|
11016 corresponding to a line end. */ |
25012 | 11017 row->glyphs[TEXT_AREA]->charpos = -1; |
11018 row->displays_text_p = 0; | |
11019 | |
11020 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines)) | |
11021 row->indicate_empty_line_p = 1; | |
11022 } | |
11023 | |
11024 it->continuation_lines_width = 0; | |
11025 row->ends_at_zv_p = 1; | |
11026 break; | |
11027 } | |
11028 | |
11029 /* Now, get the metrics of what we want to display. This also | |
11030 generates glyphs in `row' (which is IT->glyph_row). */ | |
11031 n_glyphs_before = row->used[TEXT_AREA]; | |
11032 x = it->current_x; | |
11033 PRODUCE_GLYPHS (it); | |
11034 | |
11035 /* If this display element was in marginal areas, continue with | |
11036 the next one. */ | |
11037 if (it->area != TEXT_AREA) | |
11038 { | |
11039 row->ascent = max (row->ascent, it->max_ascent); | |
11040 row->height = max (row->height, it->max_ascent + it->max_descent); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11041 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11042 row->phys_height = max (row->phys_height, |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11043 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11044 set_iterator_to_next (it); |
11045 continue; | |
11046 } | |
11047 | |
11048 /* Does the display element fit on the line? If we truncate | |
11049 lines, we should draw past the right edge of the window. If | |
11050 we don't truncate, we want to stop so that we can display the | |
11051 continuation glyph before the right margin. If lines are | |
11052 continued, there are two possible strategies for characters | |
11053 resulting in more than 1 glyph (e.g. tabs): Display as many | |
11054 glyphs as possible in this line and leave the rest for the | |
11055 continuation line, or display the whole element in the next | |
11056 line. Original redisplay did the former, so we do it also. */ | |
11057 nglyphs = row->used[TEXT_AREA] - n_glyphs_before; | |
11058 hpos_before = it->hpos; | |
11059 x_before = x; | |
11060 | |
11061 if (nglyphs == 1 | |
11062 && it->current_x < it->last_visible_x) | |
11063 { | |
11064 ++it->hpos; | |
11065 row->ascent = max (row->ascent, it->max_ascent); | |
11066 row->height = max (row->height, it->max_ascent + it->max_descent); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11067 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11068 row->phys_height = max (row->phys_height, |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11069 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11070 if (it->current_x - it->pixel_width < it->first_visible_x) |
11071 row->x = x - it->first_visible_x; | |
11072 } | |
11073 else | |
11074 { | |
11075 int new_x; | |
11076 struct glyph *glyph; | |
11077 | |
11078 for (i = 0; i < nglyphs; ++i, x = new_x) | |
11079 { | |
11080 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
11081 new_x = x + glyph->pixel_width; | |
11082 | |
11083 if (/* Lines are continued. */ | |
11084 !it->truncate_lines_p | |
11085 && (/* Glyph doesn't fit on the line. */ | |
11086 new_x > it->last_visible_x | |
11087 /* Or it fits exactly on a window system frame. */ | |
11088 || (new_x == it->last_visible_x | |
11089 && FRAME_WINDOW_P (it->f)))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11090 { |
25012 | 11091 /* End of a continued line. */ |
11092 | |
11093 if (it->hpos == 0 | |
11094 || (new_x == it->last_visible_x | |
11095 && FRAME_WINDOW_P (it->f))) | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11096 { |
25012 | 11097 /* Current glyph fits exactly on the line. We |
11098 must continue the line because we can't draw | |
11099 the cursor after the glyph. */ | |
11100 row->continued_p = 1; | |
11101 it->current_x = new_x; | |
11102 it->continuation_lines_width += new_x; | |
11103 ++it->hpos; | |
11104 if (i == nglyphs - 1) | |
11105 set_iterator_to_next (it); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11106 } |
25012 | 11107 else |
11108 { | |
11109 /* Display element draws past the right edge of | |
11110 the window. Restore positions to values | |
11111 before the element. The next line starts | |
11112 with current_x before the glyph that could | |
11113 not be displayed, so that TAB works right. */ | |
11114 row->used[TEXT_AREA] = n_glyphs_before + i; | |
11115 | |
11116 /* Display continuation glyphs. */ | |
11117 if (!FRAME_WINDOW_P (it->f)) | |
11118 produce_special_glyphs (it, IT_CONTINUATION); | |
11119 row->continued_p = 1; | |
11120 | |
11121 it->current_x = x; | |
11122 it->continuation_lines_width += x; | |
11123 } | |
11124 break; | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11125 } |
25012 | 11126 else if (new_x > it->first_visible_x) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11127 { |
25012 | 11128 /* Increment number of glyphs actually displayed. */ |
11129 ++it->hpos; | |
11130 | |
11131 if (x < it->first_visible_x) | |
11132 /* Glyph is partially visible, i.e. row starts at | |
11133 negative X position. */ | |
11134 row->x = x - it->first_visible_x; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11135 } |
25012 | 11136 else |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11137 { |
25012 | 11138 /* Glyph is completely off the left margin of the |
11139 window. This should not happen because of the | |
11140 move_it_in_display_line at the start of | |
11141 this function. */ | |
11142 abort (); | |
11854
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11143 } |
637c5283e74b
(zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
11810
diff
changeset
|
11144 } |
25012 | 11145 |
11146 row->ascent = max (row->ascent, it->max_ascent); | |
11147 row->height = max (row->height, it->max_ascent + it->max_descent); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11148 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11149 row->phys_height = max (row->phys_height, |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11150 it->max_phys_ascent + it->max_phys_descent); |
25012 | 11151 |
11152 /* End of this display line if row is continued. */ | |
11153 if (row->continued_p) | |
11154 break; | |
11155 } | |
11156 | |
11157 /* Is this a line end? If yes, we're also done, after making | |
11158 sure that a non-default face is extended up to the right | |
11159 margin of the window. */ | |
11160 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
11161 { | |
11162 int used_before = row->used[TEXT_AREA]; | |
11163 | |
11164 /* Add a space at the end of the line that is used to | |
11165 display the cursor there. */ | |
11166 append_space (it, 0); | |
11167 | |
11168 /* Extend the face to the end of the line. */ | |
11169 extend_face_to_end_of_line (it); | |
11170 | |
11171 /* Make sure we have the position. */ | |
11172 if (used_before == 0) | |
11173 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position); | |
11174 | |
11175 /* Consume the line end. This skips over invisible lines. */ | |
11176 set_iterator_to_next (it); | |
11177 it->continuation_lines_width = 0; | |
2754
af06c054b48f
(display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents:
2742
diff
changeset
|
11178 break; |
277 | 11179 } |
25012 | 11180 |
11181 /* Proceed with next display element. Note that this skips | |
11182 over lines invisible because of selective display. */ | |
11183 set_iterator_to_next (it); | |
11184 | |
11185 /* If we truncate lines, we are done when the last displayed | |
11186 glyphs reach past the right margin of the window. */ | |
11187 if (it->truncate_lines_p | |
11188 && (FRAME_WINDOW_P (it->f) | |
11189 ? (it->current_x >= it->last_visible_x) | |
11190 : (it->current_x > it->last_visible_x))) | |
11191 { | |
11192 /* Maybe add truncation glyphs. */ | |
11193 if (!FRAME_WINDOW_P (it->f)) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11194 { |
25012 | 11195 --it->glyph_row->used[TEXT_AREA]; |
11196 produce_special_glyphs (it, IT_TRUNCATION); | |
277 | 11197 } |
25012 | 11198 |
11199 row->truncated_on_right_p = 1; | |
11200 it->continuation_lines_width = 0; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
11201 reseat_at_next_visible_line_start (it, 0); |
25012 | 11202 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; |
11203 it->hpos = hpos_before; | |
11204 it->current_x = x_before; | |
11205 break; | |
11206 } | |
11207 } | |
11208 | |
11209 /* If line is not empty and hscrolled, maybe insert truncation glyphs | |
11210 at the left window margin. */ | |
11211 if (it->first_visible_x | |
11212 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row)) | |
11213 { | |
11214 if (!FRAME_WINDOW_P (it->f)) | |
11215 insert_left_trunc_glyphs (it); | |
11216 row->truncated_on_left_p = 1; | |
11217 } | |
11218 | |
11219 /* If the start of this line is the overlay arrow-position, then | |
11220 mark this glyph row as the one containing the overlay arrow. | |
11221 This is clearly a mess with variable size fonts. It would be | |
11222 better to let it be displayed like cursors under X. */ | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11223 if (MARKERP (Voverlay_arrow_position) |
277 | 11224 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer |
25012 | 11225 && (MATRIX_ROW_START_CHARPOS (row) |
11226 == 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
|
11227 && STRINGP (Voverlay_arrow_string) |
277 | 11228 && ! overlay_arrow_seen) |
11229 { | |
25012 | 11230 /* Overlay arrow in window redisplay is a bitmap. */ |
11231 if (!FRAME_WINDOW_P (it->f)) | |
11232 { | |
11233 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w); | |
11234 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | |
11235 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | |
11236 struct glyph *p = row->glyphs[TEXT_AREA]; | |
11237 struct glyph *p2, *end; | |
11238 | |
11239 /* Copy the arrow glyphs. */ | |
11240 while (glyph < arrow_end) | |
11241 *p++ = *glyph++; | |
11242 | |
11243 /* Throw away padding glyphs. */ | |
11244 p2 = p; | |
11245 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]; | |
11246 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2)) | |
11247 ++p2; | |
11248 if (p2 > p) | |
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
|
11249 { |
25012 | 11250 while (p2 < end) |
11251 *p++ = *p2++; | |
11252 row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA]; | |
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
|
11253 } |
25012 | 11254 } |
11255 | |
277 | 11256 overlay_arrow_seen = 1; |
25012 | 11257 row->overlay_arrow_p = 1; |
11258 } | |
11259 | |
11260 /* Compute pixel dimensions of this line. */ | |
11261 compute_line_metrics (it); | |
11262 | |
11263 /* Remember the position at which this line ends. */ | |
11264 row->end = it->current; | |
11265 | |
11266 /* Maybe set the cursor. If you change this, it's probably a good | |
11267 idea to also change the code in redisplay_window for cursor | |
11268 movement in an unchanged window. */ | |
11269 if (it->w->cursor.vpos < 0 | |
11270 && PT >= MATRIX_ROW_START_CHARPOS (row) | |
11271 && MATRIX_ROW_END_CHARPOS (row) >= PT | |
11272 && !(MATRIX_ROW_END_CHARPOS (row) == PT | |
11273 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row) | |
11274 || !row->ends_at_zv_p))) | |
11275 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); | |
11276 | |
11277 /* Highlight trailing whitespace. */ | |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
11278 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 11279 highlight_trailing_whitespace (it->f, it->glyph_row); |
11280 | |
11281 /* Prepare for the next line. This line starts horizontally at (X | |
11282 HPOS) = (0 0). Vertical positions are incremented. As a | |
11283 convenience for the caller, IT->glyph_row is set to the next | |
11284 row to be used. */ | |
11285 it->current_x = it->hpos = 0; | |
11286 it->current_y += row->height; | |
11287 ++it->vpos; | |
11288 ++it->glyph_row; | |
11289 return row->displays_text_p; | |
11290 } | |
11291 | |
11292 | |
277 | 11293 |
25012 | 11294 /*********************************************************************** |
11295 Menu Bar | |
11296 ***********************************************************************/ | |
11297 | |
11298 /* Redisplay the menu bar in the frame for window W. | |
11299 | |
11300 The menu bar of X frames that don't have X toolkit support is | |
11301 displayed in a special window W->frame->menu_bar_window. | |
11302 | |
11303 The menu bar of terminal frames is treated specially as far as | |
11304 glyph matrices are concerned. Menu bar lines are not part of | |
11305 windows, so the update is done directly on the frame matrix rows | |
11306 for the menu bar. */ | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11307 |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11308 static void |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11309 display_menu_bar (w) |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11310 struct window *w; |
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11311 { |
25012 | 11312 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
11313 struct it it; | |
11314 Lisp_Object items; | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11315 int i; |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11316 |
25012 | 11317 /* Don't do all this for graphical frames. */ |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11318 #ifdef HAVE_NTGUI |
15245
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11319 if (!NILP (Vwindow_system)) |
4bfe3c580496
(display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents:
15111
diff
changeset
|
11320 return; |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11321 #endif |
25012 | 11322 #ifdef USE_X_TOOLKIT |
11323 if (FRAME_X_P (f)) | |
11324 return; | |
11325 #endif | |
13511
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11326 |
a0fd601c9d5b
(display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents:
13459
diff
changeset
|
11327 #ifdef USE_X_TOOLKIT |
25012 | 11328 xassert (!FRAME_WINDOW_P (f)); |
25882
42efd343a3f8
(display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25832
diff
changeset
|
11329 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID); |
25012 | 11330 it.first_visible_x = 0; |
11331 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
11332 #else /* not USE_X_TOOLKIT */ | |
11333 if (FRAME_WINDOW_P (f)) | |
11334 { | |
11335 /* Menu bar lines are displayed in the desired matrix of the | |
11336 dummy window menu_bar_window. */ | |
11337 struct window *menu_w; | |
11338 xassert (WINDOWP (f->menu_bar_window)); | |
11339 menu_w = XWINDOW (f->menu_bar_window); | |
11340 init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows, | |
25882
42efd343a3f8
(display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25832
diff
changeset
|
11341 MENU_FACE_ID); |
25012 | 11342 it.first_visible_x = 0; |
11343 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f); | |
11344 } | |
11345 else | |
11346 { | |
11347 /* This is a TTY frame, i.e. character hpos/vpos are used as | |
11348 pixel x/y. */ | |
11349 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, | |
25882
42efd343a3f8
(display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25832
diff
changeset
|
11350 MENU_FACE_ID); |
25012 | 11351 it.first_visible_x = 0; |
11352 it.last_visible_x = FRAME_WIDTH (f); | |
11353 } | |
11354 #endif /* not USE_X_TOOLKIT */ | |
11355 | |
11356 /* Clear all rows of the menu bar. */ | |
11357 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i) | |
11358 { | |
11359 struct glyph_row *row = it.glyph_row + i; | |
11360 clear_glyph_row (row); | |
11361 row->enabled_p = 1; | |
11362 row->full_width_p = 1; | |
11363 } | |
11364 | |
11365 /* Make the first line of the menu bar appear in reverse video. */ | |
11366 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
11367 | |
11368 /* Display all items of the menu bar. */ | |
11369 items = FRAME_MENU_BAR_ITEMS (it.f); | |
15111
6a5ae152de0d
(display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents:
15038
diff
changeset
|
11370 for (i = 0; i < XVECTOR (items)->size; i += 4) |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11371 { |
25012 | 11372 Lisp_Object string; |
11373 | |
11374 /* Stop at nil string. */ | |
6134
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11375 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
|
11376 if (NILP (string)) |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11377 break; |
c656768172d2
(update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents:
6091
diff
changeset
|
11378 |
25012 | 11379 /* Remember where item was displayed. */ |
11380 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos); | |
11381 | |
11382 /* Display the item, pad with one space. */ | |
11383 if (it.current_x < it.last_visible_x) | |
11384 display_string (NULL, string, Qnil, 0, 0, &it, | |
11385 XSTRING (string)->size + 1, 0, 0, -1); | |
11386 } | |
2189
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
11387 |
cb92d253a599
(display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents:
2150
diff
changeset
|
11388 /* Fill out the line with spaces. */ |
25012 | 11389 if (it.current_x < it.last_visible_x) |
11390 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1); | |
11391 | |
11392 /* Compute the total height of the lines. */ | |
11393 compute_line_metrics (&it); | |
11394 } | |
11395 | |
11396 | |
2150
cb8205e30dda
(display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2065
diff
changeset
|
11397 |
25012 | 11398 /*********************************************************************** |
11399 Mode Line | |
11400 ***********************************************************************/ | |
11401 | |
11402 /* Display the mode and/or top line of window W. */ | |
277 | 11403 |
11404 static void | |
25012 | 11405 display_mode_lines (w) |
277 | 11406 struct window *w; |
11407 { | |
25012 | 11408 /* These will be set while the mode line specs are processed. */ |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11409 line_number_displayed = 0; |
10441
f1fc7b6e5fa4
(redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents:
10416
diff
changeset
|
11410 w->column_number_displayed = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11411 |
25012 | 11412 if (WINDOW_WANTS_MODELINE_P (w)) |
25546 | 11413 display_mode_line (w, MODE_LINE_FACE_ID, |
11414 current_buffer->mode_line_format); | |
11415 | |
11416 if (WINDOW_WANTS_HEADER_LINE_P (w)) | |
11417 display_mode_line (w, HEADER_LINE_FACE_ID, | |
11418 current_buffer->header_line_format); | |
25012 | 11419 } |
11420 | |
11421 | |
11422 /* Display mode or top line of window W. FACE_ID specifies which line | |
25546 | 11423 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID. |
25012 | 11424 FORMAT is the mode line format to display. */ |
11425 | |
11426 static void | |
11427 display_mode_line (w, face_id, format) | |
11428 struct window *w; | |
11429 enum face_id face_id; | |
11430 Lisp_Object format; | |
11431 { | |
11432 struct it it; | |
11433 struct face *face; | |
11434 | |
11435 init_iterator (&it, w, -1, -1, NULL, face_id); | |
11436 prepare_desired_row (it.glyph_row); | |
11437 | |
11438 /* Temporarily make frame's keyboard the current kboard so that | |
11439 kboard-local variables in the mode_line_format will get the right | |
11440 values. */ | |
11441 push_frame_kboard (it.f); | |
11442 display_mode_element (&it, 0, 0, 0, format); | |
11354
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
11443 pop_frame_kboard (); |
17f7be3e2443
(display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents:
11291
diff
changeset
|
11444 |
25012 | 11445 /* Fill up with spaces. */ |
11446 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0); | |
11447 | |
11448 compute_line_metrics (&it); | |
11449 it.glyph_row->full_width_p = 1; | |
11450 it.glyph_row->mode_line_p = 1; | |
11451 it.glyph_row->inverse_p = mode_line_inverse_video != 0; | |
11452 it.glyph_row->continued_p = 0; | |
11453 it.glyph_row->truncated_on_left_p = 0; | |
11454 it.glyph_row->truncated_on_right_p = 0; | |
11455 | |
11456 /* Make a 3D mode-line have a shadow at its right end. */ | |
11457 face = FACE_FROM_ID (it.f, face_id); | |
11458 extend_face_to_end_of_line (&it); | |
11459 if (face->box != FACE_NO_BOX) | |
11460 { | |
11461 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] | |
11462 + it.glyph_row->used[TEXT_AREA] - 1); | |
11463 last->right_box_line_p = 1; | |
11464 } | |
11465 } | |
11466 | |
11467 | |
11468 /* Contribute ELT to the mode line for window IT->w. How it | |
11469 translates into text depends on its data type. | |
11470 | |
11471 IT describes the display environment in which we display, as usual. | |
277 | 11472 |
11473 DEPTH is the depth in recursion. It is used to prevent | |
11474 infinite recursion here. | |
11475 | |
25012 | 11476 FIELD_WIDTH is the number of characters the display of ELT should |
11477 occupy in the mode line, and PRECISION is the maximum number of | |
11478 characters to display from ELT's representation. See | |
11479 display_string for details. * | |
11480 | |
11481 Returns the hpos of the end of the text generated by ELT. */ | |
277 | 11482 |
11483 static int | |
25012 | 11484 display_mode_element (it, depth, field_width, precision, elt) |
11485 struct it *it; | |
277 | 11486 int depth; |
25012 | 11487 int field_width, precision; |
11488 Lisp_Object elt; | |
11489 { | |
11490 int n = 0, field, prec; | |
11491 | |
277 | 11492 tail_recurse: |
11493 if (depth > 10) | |
11494 goto invalid; | |
11495 | |
11496 depth++; | |
11497 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
10442
diff
changeset
|
11498 switch (SWITCH_ENUM_CAST (XTYPE (elt))) |
277 | 11499 { |
11500 case Lisp_String: | |
11501 { | |
11502 /* A string: output it and check for %-constructs within it. */ | |
25012 | 11503 unsigned char c; |
11504 unsigned char *this = XSTRING (elt)->data; | |
11505 unsigned char *lisp_string = this; | |
11506 | |
11507 while ((precision <= 0 || n < precision) | |
11508 && *this | |
11509 && (frame_title_ptr | |
11510 || it->current_x < it->last_visible_x)) | |
277 | 11511 { |
11512 unsigned char *last = this; | |
25012 | 11513 |
11514 /* Advance to end of string or next format specifier. */ | |
277 | 11515 while ((c = *this++) != '\0' && c != '%') |
11516 ; | |
25012 | 11517 |
277 | 11518 if (this - 1 != last) |
11519 { | |
25012 | 11520 /* Output to end of string or up to '%'. Field width |
11521 is length of string. Don't output more than | |
11522 PRECISION allows us. */ | |
11523 prec = --this - last; | |
11524 if (precision > 0 && prec > precision - n) | |
11525 prec = precision - n; | |
11526 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11527 if (frame_title_ptr) |
25012 | 11528 n += store_frame_title (last, prec, prec); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11529 else |
25012 | 11530 n += display_string (NULL, elt, Qnil, 0, last - lisp_string, |
11531 it, 0, prec, 0, -1); | |
277 | 11532 } |
11533 else /* c == '%' */ | |
11534 { | |
25012 | 11535 unsigned char *percent_position = this; |
11536 | |
11537 /* Get the specified minimum width. Zero means | |
11538 don't pad. */ | |
11539 field = 0; | |
277 | 11540 while ((c = *this++) >= '0' && c <= '9') |
25012 | 11541 field = field * 10 + c - '0'; |
11542 | |
11543 /* Don't pad beyond the total padding allowed. */ | |
11544 if (field_width - n > 0 && field > field_width - n) | |
11545 field = field_width - n; | |
11546 | |
11547 /* Note that either PRECISION <= 0 or N < PRECISION. */ | |
11548 prec = precision - n; | |
11549 | |
277 | 11550 if (c == 'M') |
25012 | 11551 n += display_mode_element (it, depth, field, prec, |
11552 Vglobal_mode_string); | |
277 | 11553 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
|
11554 { |
25012 | 11555 unsigned char *spec |
11556 = decode_mode_spec (it->w, c, field, prec); | |
11557 | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11558 if (frame_title_ptr) |
25012 | 11559 n += store_frame_title (spec, field, prec); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11560 else |
25012 | 11561 { |
11562 int nglyphs_before | |
11563 = it->glyph_row->used[TEXT_AREA]; | |
11564 int charpos | |
11565 = percent_position - XSTRING (elt)->data; | |
11566 int nwritten | |
11567 = display_string (spec, Qnil, elt, charpos, 0, it, | |
11568 field, prec, 0, -1); | |
11569 | |
11570 /* Assign to the glyphs written above the | |
11571 string where the `%x' came from, position | |
11572 of the `%'. */ | |
11573 if (nwritten > 0) | |
11574 { | |
11575 struct glyph *glyph | |
11576 = (it->glyph_row->glyphs[TEXT_AREA] | |
11577 + nglyphs_before); | |
11578 int i; | |
11579 | |
11580 for (i = 0; i < nwritten; ++i) | |
11581 { | |
11582 glyph[i].object = elt; | |
11583 glyph[i].charpos = charpos; | |
11584 } | |
11585 | |
11586 n += nwritten; | |
11587 } | |
11588 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11589 } |
277 | 11590 } |
11591 } | |
11592 } | |
11593 break; | |
11594 | |
11595 case Lisp_Symbol: | |
11596 /* A symbol: process the value of the symbol recursively | |
11597 as if it appeared here directly. Avoid error if symbol void. | |
11598 Special case: if value of symbol is a string, output the string | |
11599 literally. */ | |
11600 { | |
11601 register Lisp_Object tem; | |
11602 tem = Fboundp (elt); | |
485 | 11603 if (!NILP (tem)) |
277 | 11604 { |
11605 tem = Fsymbol_value (elt); | |
11606 /* If value is a string, output that string literally: | |
11607 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
|
11608 if (STRINGP (tem)) |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11609 { |
25012 | 11610 prec = XSTRING (tem)->size; |
11611 if (precision > 0 && prec > precision - n) | |
11612 prec = precision - n; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11613 if (frame_title_ptr) |
25012 | 11614 n += store_frame_title (XSTRING (tem)->data, -1, prec); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11615 else |
25012 | 11616 n += display_string (NULL, tem, Qnil, 0, 0, it, |
11617 0, prec, 0, -1); | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11618 } |
277 | 11619 else if (!EQ (tem, elt)) |
25012 | 11620 { |
11621 /* Give up right away for nil or t. */ | |
11622 elt = tem; | |
11623 goto tail_recurse; | |
11624 } | |
277 | 11625 } |
11626 } | |
11627 break; | |
11628 | |
11629 case Lisp_Cons: | |
11630 { | |
11631 register Lisp_Object car, tem; | |
11632 | |
11633 /* A cons cell: three distinct cases. | |
11634 If first element is a string or a cons, process all the elements | |
11635 and effectively concatenate them. | |
11636 If first element is a negative number, truncate displaying cdr to | |
11637 at most that many characters. If positive, pad (with spaces) | |
11638 to at least that many characters. | |
11639 If first element is a symbol, process the cadr or caddr recursively | |
11640 according to whether the symbol's value is non-nil or nil. */ | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11641 car = XCAR (elt); |
25012 | 11642 if (EQ (car, QCeval) && CONSP (XCDR (elt))) |
11643 { | |
11644 /* An element of the form (:eval FORM) means evaluate FORM | |
11645 and use the result as mode line elements. */ | |
11646 struct gcpro gcpro1; | |
11647 Lisp_Object spec; | |
11648 | |
11649 spec = eval_form (XCAR (XCDR (elt))); | |
11650 GCPRO1 (spec); | |
11651 n += display_mode_element (it, depth, field_width - n, | |
11652 precision - n, spec); | |
11653 UNGCPRO; | |
11654 } | |
11655 else if (SYMBOLP (car)) | |
277 | 11656 { |
11657 tem = Fboundp (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11658 elt = XCDR (elt); |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11659 if (!CONSP (elt)) |
277 | 11660 goto invalid; |
11661 /* elt is now the cdr, and we know it is a cons cell. | |
11662 Use its car if CAR has a non-nil value. */ | |
485 | 11663 if (!NILP (tem)) |
277 | 11664 { |
11665 tem = Fsymbol_value (car); | |
485 | 11666 if (!NILP (tem)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11667 { |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11668 elt = XCAR (elt); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11669 goto tail_recurse; |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11670 } |
277 | 11671 } |
11672 /* Symbol's value is nil (or symbol is unbound) | |
11673 Get the cddr of the original list | |
11674 and if possible find the caddr and use that. */ | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11675 elt = XCDR (elt); |
485 | 11676 if (NILP (elt)) |
277 | 11677 break; |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11678 else if (!CONSP (elt)) |
277 | 11679 goto invalid; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11680 elt = XCAR (elt); |
277 | 11681 goto tail_recurse; |
11682 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11683 else if (INTEGERP (car)) |
277 | 11684 { |
11685 register int lim = XINT (car); | |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11686 elt = XCDR (elt); |
277 | 11687 if (lim < 0) |
25012 | 11688 { |
11689 /* Negative int means reduce maximum width. */ | |
11690 if (precision <= 0) | |
11691 precision = -lim; | |
11692 else | |
11693 precision = min (precision, -lim); | |
11694 } | |
277 | 11695 else if (lim > 0) |
11696 { | |
11697 /* Padding specified. Don't let it be more than | |
11698 current maximum. */ | |
25012 | 11699 if (precision > 0) |
11700 lim = min (precision, lim); | |
11701 | |
277 | 11702 /* If that's more padding than already wanted, queue it. |
11703 But don't reduce padding already specified even if | |
11704 that is beyond the current truncation point. */ | |
25012 | 11705 field_width = max (lim, field_width); |
277 | 11706 } |
11707 goto tail_recurse; | |
11708 } | |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
11709 else if (STRINGP (car) || CONSP (car)) |
277 | 11710 { |
11711 register int limit = 50; | |
25012 | 11712 /* Limit is to protect against circular lists. */ |
11713 while (CONSP (elt) | |
11714 && --limit > 0 | |
11715 && (precision <= 0 || n < precision)) | |
277 | 11716 { |
25012 | 11717 n += display_mode_element (it, depth, field_width - n, |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11718 precision - n, XCAR (elt)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
11719 elt = XCDR (elt); |
277 | 11720 } |
11721 } | |
11722 } | |
11723 break; | |
11724 | |
11725 default: | |
11726 invalid: | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11727 if (frame_title_ptr) |
25012 | 11728 n += store_frame_title ("*invalid*", 0, precision - n); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11729 else |
25012 | 11730 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0, |
11731 precision - n, 0, 0); | |
11732 return n; | |
11733 } | |
11734 | |
11735 /* Pad to FIELD_WIDTH. */ | |
11736 if (field_width > 0 && n < field_width) | |
11737 { | |
11738 if (frame_title_ptr) | |
11739 n += store_frame_title ("", field_width - n, 0); | |
11740 else | |
11741 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n, | |
11742 0, 0, 0); | |
11743 } | |
11744 | |
11745 return n; | |
11746 } | |
11747 | |
11748 | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11749 /* Write a null-terminated, right justified decimal representation of |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11750 the positive integer D to BUF using a minimal field width WIDTH. */ |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11751 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11752 static void |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11753 pint2str (buf, width, d) |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11754 register char *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11755 register int width; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11756 register int d; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11757 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11758 register char *p = buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11759 |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11760 if (d <= 0) |
25012 | 11761 *p++ = '0'; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11762 else |
25012 | 11763 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11764 while (d > 0) |
25012 | 11765 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11766 *p++ = d % 10 + '0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11767 d /= 10; |
25012 | 11768 } |
11769 } | |
11770 | |
11771 for (width -= (int) (p - buf); width > 0; --width) | |
11772 *p++ = ' '; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11773 *p-- = '\0'; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11774 while (p > buf) |
25012 | 11775 { |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11776 d = *buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11777 *buf++ = *p; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11778 *p-- = d; |
25012 | 11779 } |
11780 } | |
11781 | |
11782 /* Set a mnemonic character for coding_system (Lisp symbol) in BUF. | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11783 If EOL_FLAG is 1, set also a mnemonic character for end-of-line |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11784 type of CODING_SYSTEM. Return updated pointer into BUF. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11785 |
24868
de2065294ca3
(invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents:
24711
diff
changeset
|
11786 static unsigned char invalid_eol_type[] = "(*invalid*)"; |
24199
204d0a24ddf5
(decode_mode_spec_coding): Display the EOL type as a string.
Eli Zaretskii <eliz@gnu.org>
parents:
24040
diff
changeset
|
11787 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11788 static char * |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11789 decode_mode_spec_coding (coding_system, buf, eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11790 Lisp_Object coding_system; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11791 register char *buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11792 int eol_flag; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11793 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11794 Lisp_Object val; |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11795 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11796 unsigned char *eol_str; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11797 int eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11798 /* The EOL conversion we are using. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11799 Lisp_Object eoltype; |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11800 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11801 val = coding_system; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11802 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11803 if (NILP (val)) /* Not yet decided. */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11804 { |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11805 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11806 *buf++ = '-'; |
18677
7648eb8e46d2
(decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents:
18653
diff
changeset
|
11807 if (eol_flag) |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11808 eoltype = eol_mnemonic_undecided; |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11809 /* Don't mention EOL conversion if it isn't decided. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11810 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11811 else |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11812 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11813 Lisp_Object eolvalue; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11814 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11815 eolvalue = Fget (coding_system, Qeol_type); |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11816 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11817 while (!NILP (val) && SYMBOLP (val)) |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11818 { |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11819 val = Fget (val, Qcoding_system); |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11820 if (NILP (eolvalue)) |
18834
a4b74a7b692a
(decode_mode_spec_coding): Fix typo; use `val' instead of `coding-system'.
Richard M. Stallman <rms@gnu.org>
parents:
18829
diff
changeset
|
11821 eolvalue = Fget (val, Qeol_type); |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11822 } |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11823 |
19045
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11824 if (multibyte) |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11825 *buf++ = XFASTINT (XVECTOR (val)->contents[1]); |
59ccb8fd4ee1
(redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
19015
diff
changeset
|
11826 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11827 if (eol_flag) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11828 { |
18525
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11829 /* The EOL conversion that is normal on this system. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11830 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11831 if (NILP (eolvalue)) /* Not yet decided. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11832 eoltype = eol_mnemonic_undecided; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11833 else if (VECTORP (eolvalue)) /* Not yet decided. */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11834 eoltype = eol_mnemonic_undecided; |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11835 else /* INTEGERP (eolvalue) -- 0:LF, 1:CRLF, 2:CR */ |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11836 eoltype = (XFASTINT (eolvalue) == 0 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11837 ? eol_mnemonic_unix |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11838 : (XFASTINT (eolvalue) == 1 |
92d4f44969c6
(decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents:
18458
diff
changeset
|
11839 ? eol_mnemonic_dos : eol_mnemonic_mac)); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11840 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11841 } |
25012 | 11842 |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11843 if (eol_flag) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11844 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11845 /* Mention the EOL conversion if it is not the usual one. */ |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11846 if (STRINGP (eoltype)) |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11847 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11848 eol_str = XSTRING (eoltype)->data; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11849 eol_str_len = XSTRING (eoltype)->size; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11850 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11851 else if (INTEGERP (eoltype) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11852 && CHAR_VALID_P (XINT (eoltype), 0)) |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11853 { |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11854 unsigned char work[4]; |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11855 |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11856 eol_str_len = CHAR_STRING (XINT (eoltype), work, eol_str); |
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11857 } |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11858 else |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11859 { |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11860 eol_str = invalid_eol_type; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11861 eol_str_len = sizeof (invalid_eol_type) - 1; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11862 } |
24511
6dbea1df5686
(decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents:
24487
diff
changeset
|
11863 bcopy (eol_str, buf, eol_str_len); |
24215
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11864 buf += eol_str_len; |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11865 } |
6e1f6e29422a
(decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
24199
diff
changeset
|
11866 |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11867 return buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11868 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
11869 |
277 | 11870 /* Return a string for the output of a mode line %-spec for window W, |
25012 | 11871 generated by character C. PRECISION >= 0 means don't return a |
11872 string longer than that value. FIELD_WIDTH > 0 means pad the | |
11873 string returned with spaces to that value. */ | |
277 | 11874 |
1017
d42877206c0a
* xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents:
973
diff
changeset
|
11875 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
|
11876 |
277 | 11877 static char * |
25012 | 11878 decode_mode_spec (w, c, field_width, precision) |
277 | 11879 struct window *w; |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26018
diff
changeset
|
11880 register int c; |
25012 | 11881 int field_width, precision; |
277 | 11882 { |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
11883 Lisp_Object obj; |
25012 | 11884 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
11885 char *decode_mode_spec_buf = f->decode_mode_spec_buffer; | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11886 struct buffer *b = XBUFFER (w->buffer); |
277 | 11887 |
6518
07ecb7a5c916
(x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6415
diff
changeset
|
11888 obj = Qnil; |
277 | 11889 |
11890 switch (c) | |
11891 { | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11892 case '*': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11893 if (!NILP (b->read_only)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11894 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11895 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11896 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11897 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11898 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11899 case '+': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11900 /* This differs from %* only for a modified read-only buffer. */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11901 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11902 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11903 if (!NILP (b->read_only)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11904 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11905 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11906 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11907 case '&': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11908 /* This differs from %* in ignoring read-only-ness. */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11909 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11910 return "*"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11911 return "-"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11912 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11913 case '%': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11914 return "%"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11915 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11916 case '[': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11917 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11918 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11919 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11920 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11921 if (command_loop_level > 5) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11922 return "[[[... "; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11923 p = decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11924 for (i = 0; i < command_loop_level; i++) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11925 *p++ = '['; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11926 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11927 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11928 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11929 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11930 case ']': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11931 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11932 int i; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11933 char *p; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11934 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11935 if (command_loop_level > 5) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11936 return " ...]]]"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11937 p = decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11938 for (i = 0; i < command_loop_level; i++) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11939 *p++ = ']'; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11940 *p = 0; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11941 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11942 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11943 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11944 case '-': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11945 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11946 register int i; |
25012 | 11947 |
11948 /* Let lots_of_dashes be a string of infinite length. */ | |
11949 if (field_width <= 0 | |
11950 || field_width > sizeof (lots_of_dashes)) | |
11951 { | |
11952 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i) | |
11953 decode_mode_spec_buf[i] = '-'; | |
11954 decode_mode_spec_buf[i] = '\0'; | |
11955 return decode_mode_spec_buf; | |
11956 } | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11957 else |
25012 | 11958 return lots_of_dashes; |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11959 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11960 |
277 | 11961 case 'b': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11962 obj = b->name; |
277 | 11963 break; |
11964 | |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11965 case 'c': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11966 { |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11967 int col = current_column (); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11968 XSETFASTINT (w->column_number_displayed, col); |
25012 | 11969 pint2str (decode_mode_spec_buf, field_width, col); |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11970 return decode_mode_spec_buf; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11971 } |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11972 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11973 case 'F': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11974 /* %F displays the frame name. */ |
25012 | 11975 if (!NILP (f->title)) |
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
11976 return (char *) XSTRING (f->title)->data; |
15382
274f64e997f0
(redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15381
diff
changeset
|
11977 if (f->explicit_name || ! FRAME_WINDOW_P (f)) |
15038
2376256a0204
(decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
15037
diff
changeset
|
11978 return (char *) XSTRING (f->name)->data; |
12348
7d39ee7e0ca3
(decode_mode_spec) [!MULTI_FRAME]: Handle %F properly.
Richard M. Stallman <rms@gnu.org>
parents:
12293
diff
changeset
|
11979 return "Emacs"; |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
11980 |
277 | 11981 case 'f': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
11982 obj = b->filename; |
277 | 11983 break; |
11984 | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11985 case 'l': |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11986 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11987 int startpos = XMARKER (w->start)->charpos; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11988 int startpos_byte = marker_byte_position (w->start); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
11989 int line, linepos, linepos_byte, topline; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11990 int nlines, junk; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11991 int height = XFASTINT (w->height); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11992 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11993 /* 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
|
11994 don't forget that too fast. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
11995 if (EQ (w->base_line_pos, w->buffer)) |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
11996 goto no_value; |
16463
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
11997 /* But do forget it, if the window shows a different buffer now. */ |
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
11998 else if (BUFFERP (w->base_line_pos)) |
c6a338fd1938
(decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents:
16397
diff
changeset
|
11999 w->base_line_pos = Qnil; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12000 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12001 /* 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
|
12002 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
|
12003 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12004 w->base_line_pos = Qnil; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12005 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12006 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12007 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12008 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12009 if (!NILP (w->base_line_number) |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12010 && !NILP (w->base_line_pos) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12011 && XFASTINT (w->base_line_pos) <= startpos) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12012 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12013 line = XFASTINT (w->base_line_number); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12014 linepos = XFASTINT (w->base_line_pos); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12015 linepos_byte = buf_charpos_to_bytepos (b, linepos); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12016 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12017 else |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12018 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12019 line = 1; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12020 linepos = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12021 linepos_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12022 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12023 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12024 /* Count lines from base line to window start position. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12025 nlines = display_count_lines (linepos, linepos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12026 startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12027 startpos, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12028 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12029 topline = nlines + line; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12030 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12031 /* 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
|
12032 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
|
12033 "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
|
12034 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
|
12035 if (startpos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12036 { |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12037 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
|
12038 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
|
12039 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12040 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
|
12041 || linepos == BUF_BEGV (b)) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12042 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12043 int limit = BUF_BEGV (b); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12044 int limit_byte = BUF_BEGV_BYTE (b); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12045 int position; |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12046 int distance = (height * 2 + 30) * line_number_display_limit_width; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12047 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12048 if (startpos - distance > limit) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12049 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12050 limit = startpos - distance; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12051 limit_byte = CHAR_TO_BYTE (limit); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12052 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12053 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12054 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12055 limit_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12056 - (height * 2 + 30), |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12057 &position); |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12058 /* If we couldn't find the lines we wanted within |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12059 line_number_display_limit_width chars per line, |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12060 give up on line numbers for this window. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12061 if (position == limit_byte && limit == startpos - distance) |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12062 { |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12063 w->base_line_pos = w->buffer; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12064 w->base_line_number = Qnil; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12065 goto no_value; |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12066 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12067 |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12068 XSETFASTINT (w->base_line_number, topline - nlines); |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12069 XSETFASTINT (w->base_line_pos, BYTE_TO_CHAR (position)); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12070 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12071 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12072 /* Now count lines from the start pos to point. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12073 nlines = display_count_lines (startpos, startpos_byte, |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12074 PT_BYTE, PT, &junk); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12075 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12076 /* Record that we did display the line number. */ |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12077 line_number_displayed = 1; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12078 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12079 /* Make the string to show. */ |
25012 | 12080 pint2str (decode_mode_spec_buf, field_width, topline + nlines); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12081 return decode_mode_spec_buf; |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12082 no_value: |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12083 { |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12084 char* p = decode_mode_spec_buf; |
25012 | 12085 int pad = field_width - 2; |
12086 while (pad-- > 0) | |
12087 *p++ = ' '; | |
12088 *p++ = '?'; | |
12089 *p = '?'; | |
12598
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12090 return decode_mode_spec_buf; |
43ebbbe0299f
(decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents:
12493
diff
changeset
|
12091 } |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12092 } |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12093 break; |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12094 |
277 | 12095 case 'm': |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12096 obj = b->mode_name; |
277 | 12097 break; |
12098 | |
12099 case 'n': | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12100 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b)) |
277 | 12101 return " Narrow"; |
12102 break; | |
12103 | |
12104 case 'p': | |
12105 { | |
12106 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
|
12107 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
|
12108 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12109 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b)) |
277 | 12110 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12111 if (pos <= BUF_BEGV (b)) |
277 | 12112 return "All"; |
12113 else | |
12114 return "Bottom"; | |
12115 } | |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12116 else if (pos <= BUF_BEGV (b)) |
277 | 12117 return "Top"; |
12118 else | |
12119 { | |
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12120 if (total > 1000000) |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12121 /* Do it differently for a large value, to avoid overflow. */ |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12122 total = ((pos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12123 else |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12124 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total; |
277 | 12125 /* We can't normally display a 3-digit number, |
12126 so get us a 2-digit number that is close. */ | |
12127 if (total == 100) | |
12128 total = 99; | |
12129 sprintf (decode_mode_spec_buf, "%2d%%", total); | |
12130 return decode_mode_spec_buf; | |
12131 } | |
12132 } | |
12133 | |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12134 /* 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
|
12135 case 'P': |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12136 { |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12137 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
|
12138 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
|
12139 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
|
12140 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12141 if (botpos >= BUF_ZV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12142 { |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12143 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12144 return "All"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12145 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12146 return "Bottom"; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12147 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12148 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12149 { |
13655
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12150 if (total > 1000000) |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12151 /* Do it differently for a large value, to avoid overflow. */ |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12152 total = ((botpos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100); |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12153 else |
5dd2d988f3c3
(decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents:
13584
diff
changeset
|
12154 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
|
12155 /* 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
|
12156 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
|
12157 if (total == 100) |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12158 total = 99; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12159 if (toppos <= BUF_BEGV (b)) |
5903
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12160 sprintf (decode_mode_spec_buf, "Top%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12161 else |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12162 sprintf (decode_mode_spec_buf, "%2d%%", total); |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12163 return decode_mode_spec_buf; |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12164 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12165 } |
0aea60a8c2d5
(decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents:
5883
diff
changeset
|
12166 |
11291
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12167 case 's': |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12168 /* status of process */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12169 obj = Fget_buffer_process (w->buffer); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12170 if (NILP (obj)) |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12171 return "no process"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12172 #ifdef subprocesses |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12173 obj = Fsymbol_name (Fprocess_status (obj)); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12174 #endif |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12175 break; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12176 |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12177 case 't': /* indicate TEXT or BINARY */ |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12178 #ifdef MODE_LINE_BINARY_TEXT |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12179 return MODE_LINE_BINARY_TEXT (b); |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12180 #else |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12181 return "T"; |
856fe1d1f30d
(redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents:
11284
diff
changeset
|
12182 #endif |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12183 |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12184 case 'z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12185 /* coding-system (not including end-of-line format) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12186 case 'Z': |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12187 /* coding-system (including end-of-line type) */ |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12188 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12189 int eol_flag = (c == 'Z'); |
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
12190 char *p = decode_mode_spec_buf; |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12191 |
19562
318a3a6a8ff5
(decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents:
19478
diff
changeset
|
12192 if (! FRAME_WINDOW_P (f)) |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12193 { |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12194 /* No need to mention EOL here--the terminal never needs |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12195 to do EOL conversion. */ |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12196 p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0); |
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12197 p = decode_mode_spec_coding (terminal_coding.symbol, p, 0); |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12198 } |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12199 p = decode_mode_spec_coding (b->buffer_file_coding_system, |
18761
756cb4d82a49
(decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents:
18752
diff
changeset
|
12200 p, eol_flag); |
18684
76bdd57b476d
(decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents:
18677
diff
changeset
|
12201 |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12202 #if 0 /* This proves to be annoying; I think we can do without. -- rms. */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12203 #ifdef subprocesses |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12204 obj = Fget_buffer_process (Fcurrent_buffer ()); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12205 if (PROCESSP (obj)) |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12206 { |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12207 p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12208 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12209 p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system, |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12210 p, eol_flag); |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12211 } |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12212 #endif /* subprocesses */ |
18652
8873a10882dc
(display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents:
18525
diff
changeset
|
12213 #endif /* 0 */ |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12214 *p = 0; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12215 return decode_mode_spec_buf; |
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12216 } |
277 | 12217 } |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12218 |
9104
610e18fd64a9
(redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents:
9088
diff
changeset
|
12219 if (STRINGP (obj)) |
277 | 12220 return (char *) XSTRING (obj)->data; |
12221 else | |
12222 return ""; | |
12223 } | |
25012 | 12224 |
12225 | |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12226 /* Count up to COUNT lines starting from START / START_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12227 But don't go beyond LIMIT_BYTE. |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12228 Return the number of lines thus found (always nonnegative). |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12229 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12230 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */ |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12231 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12232 static int |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12233 display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12234 int start, start_byte, limit_byte, count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12235 int *byte_pos_ptr; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12236 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12237 register unsigned char *cursor; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12238 unsigned char *base; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12239 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12240 register int ceiling; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12241 register unsigned char *ceiling_addr; |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12242 int orig_count = count; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12243 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12244 /* If we are not in selective display mode, |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12245 check only for newlines. */ |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12246 int selective_display = (!NILP (current_buffer->selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12247 && !INTEGERP (current_buffer->selective_display)); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12248 |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12249 if (count > 0) |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12250 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12251 while (start_byte < limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12252 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12253 ceiling = BUFFER_CEILING_OF (start_byte); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12254 ceiling = min (limit_byte - 1, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12255 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12256 base = (cursor = BYTE_POS_ADDR (start_byte)); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12257 while (1) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12258 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12259 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12260 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12261 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12262 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12263 while (*cursor != '\n' && ++cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12264 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12265 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12266 if (cursor != ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12267 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12268 if (--count == 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12269 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12270 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12271 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12272 return orig_count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12273 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12274 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12275 if (++cursor == ceiling_addr) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12276 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12277 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12278 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12279 break; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12280 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12281 start_byte += cursor - base; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12282 } |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12283 } |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12284 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12285 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12286 while (start_byte > limit_byte) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12287 { |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12288 ceiling = BUFFER_FLOOR_OF (start_byte - 1); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12289 ceiling = max (limit_byte, ceiling); |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12290 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12291 base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1); |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12292 while (1) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12293 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12294 if (selective_display) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12295 while (--cursor != ceiling_addr |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12296 && *cursor != '\n' && *cursor != 015) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12297 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12298 else |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12299 while (--cursor != ceiling_addr && *cursor != '\n') |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12300 ; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12301 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12302 if (cursor != ceiling_addr) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12303 { |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12304 if (++count == 0) |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12305 { |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12306 start_byte += cursor - base + 1; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12307 *byte_pos_ptr = start_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12308 /* When scanning backwards, we should |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12309 not count the newline posterior to which we stop. */ |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12310 return - orig_count - 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12311 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12312 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12313 else |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12314 break; |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12315 } |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12316 /* Here we add 1 to compensate for the last decrement |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12317 of CURSOR, which took it past the valid range. */ |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12318 start_byte += cursor - base + 1; |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12319 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12320 } |
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12321 |
20536
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12322 *byte_pos_ptr = limit_byte; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12323 |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12324 if (count < 0) |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12325 return - orig_count + count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12326 return orig_count - count; |
8f88438d9f61
(redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents:
20521
diff
changeset
|
12327 |
8622
4ce43042e7ad
(display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8594
diff
changeset
|
12328 } |
25012 | 12329 |
12330 | |
277 | 12331 |
25012 | 12332 /*********************************************************************** |
12333 Displaying strings | |
12334 ***********************************************************************/ | |
12335 | |
12336 /* Display a NUL-terminated string, starting with index START. | |
12337 | |
12338 If STRING is non-null, display that C string. Otherwise, the Lisp | |
12339 string LISP_STRING is displayed. | |
12340 | |
12341 If FACE_STRING is not nil, FACE_STRING_POS is a position in | |
12342 FACE_STRING. Display STRING or LISP_STRING with the face at | |
12343 FACE_STRING_POS in FACE_STRING: | |
12344 | |
12345 Display the string in the environment given by IT, but use the | |
12346 standard display table, temporarily. | |
12347 | |
12348 FIELD_WIDTH is the minimum number of output glyphs to produce. | |
12349 If STRING has fewer characters than FIELD_WIDTH, pad to the right | |
12350 with spaces. If STRING has more characters, more than FIELD_WIDTH | |
12351 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad. | |
12352 | |
12353 PRECISION is the maximum number of characters to output from | |
12354 STRING. PRECISION < 0 means don't truncate the string. | |
12355 | |
12356 This is roughly equivalent to printf format specifiers: | |
12357 | |
12358 FIELD_WIDTH PRECISION PRINTF | |
12359 ---------------------------------------- | |
12360 -1 -1 %s | |
12361 -1 10 %.10s | |
12362 10 -1 %10s | |
12363 20 10 %20.10s | |
12364 | |
12365 MULTIBYTE zero means do not display multibyte chars, > 0 means do | |
12366 display them, and < 0 means obey the current buffer's value of | |
12367 enable_multibyte_characters. | |
12368 | |
12369 Value is the number of glyphs produced. */ | |
277 | 12370 |
12371 static int | |
25012 | 12372 display_string (string, lisp_string, face_string, face_string_pos, |
12373 start, it, field_width, precision, max_x, multibyte) | |
277 | 12374 unsigned char *string; |
25012 | 12375 Lisp_Object lisp_string; |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26018
diff
changeset
|
12376 Lisp_Object face_string; |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26018
diff
changeset
|
12377 int face_string_pos; |
25012 | 12378 int start; |
12379 struct it *it; | |
12380 int field_width, precision, max_x; | |
19915
0ee6d171e8af
When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents:
19789
diff
changeset
|
12381 int multibyte; |
277 | 12382 { |
25012 | 12383 int hpos_at_start = it->hpos; |
12384 int saved_face_id = it->face_id; | |
12385 struct glyph_row *row = it->glyph_row; | |
12386 | |
12387 /* Initialize the iterator IT for iteration over STRING beginning | |
12388 with index START. We assume that IT may be modified here (which | |
12389 means that display_line has to do something when displaying a | |
12390 mini-buffer prompt, which it does). */ | |
12391 reseat_to_string (it, string, lisp_string, start, | |
12392 precision, field_width, multibyte); | |
12393 | |
12394 /* If displaying STRING, set up the face of the iterator | |
12395 from LISP_STRING, if that's given. */ | |
12396 if (STRINGP (face_string)) | |
12397 { | |
12398 int endptr; | |
12399 struct face *face; | |
12400 | |
12401 it->face_id | |
12402 = face_at_string_position (it->w, face_string, face_string_pos, | |
12403 0, it->region_beg_charpos, | |
12404 it->region_end_charpos, | |
12405 &endptr, it->base_face_id); | |
12406 face = FACE_FROM_ID (it->f, it->face_id); | |
12407 it->face_box_p = face->box != FACE_NO_BOX; | |
12408 } | |
12409 | |
12410 /* Set max_x to the maximum allowed X position. Don't let it go | |
12411 beyond the right edge of the window. */ | |
12412 if (max_x <= 0) | |
12413 max_x = it->last_visible_x; | |
12414 else | |
12415 max_x = min (max_x, it->last_visible_x); | |
12416 | |
12417 /* Skip over display elements that are not visible. because IT->w is | |
12418 hscrolled. */ | |
12419 if (it->current_x < it->first_visible_x) | |
12420 move_it_in_display_line_to (it, 100000, it->first_visible_x, | |
12421 MOVE_TO_POS | MOVE_TO_X); | |
12422 | |
12423 row->ascent = it->max_ascent; | |
12424 row->height = it->max_ascent + it->max_descent; | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
12425 row->phys_ascent = it->max_phys_ascent; |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
12426 row->phys_height = it->max_phys_ascent + it->max_phys_descent; |
25012 | 12427 |
12428 /* This condition is for the case that we are called with current_x | |
12429 past last_visible_x. */ | |
12430 while (it->current_x < max_x) | |
12431 { | |
12432 int x_before, x, n_glyphs_before, i, nglyphs; | |
12433 | |
12434 /* Get the next display element. */ | |
12435 if (!get_next_display_element (it)) | |
12436 break; | |
12437 | |
12438 /* Produce glyphs. */ | |
12439 x_before = it->current_x; | |
12440 n_glyphs_before = it->glyph_row->used[TEXT_AREA]; | |
12441 PRODUCE_GLYPHS (it); | |
12442 | |
12443 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; | |
12444 i = 0; | |
12445 x = x_before; | |
12446 while (i < nglyphs) | |
12447 { | |
12448 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; | |
12449 | |
12450 if (!it->truncate_lines_p | |
12451 && x + glyph->pixel_width > max_x) | |
5800
295e342614a4
(fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5739
diff
changeset
|
12452 { |
25012 | 12453 /* End of continued line or max_x reached. */ |
12454 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; | |
12455 it->current_x = x; | |
12456 break; | |
277 | 12457 } |
25012 | 12458 else if (x + glyph->pixel_width > it->first_visible_x) |
12459 { | |
12460 /* Glyph is at least partially visible. */ | |
12461 ++it->hpos; | |
12462 if (x < it->first_visible_x) | |
12463 it->glyph_row->x = x - it->first_visible_x; | |
12464 } | |
12465 else | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12466 { |
25012 | 12467 /* Glyph is off the left margin of the display area. |
12468 Should not happen. */ | |
12469 abort (); | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12470 } |
23647
d87960db41e9
(display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents:
23417
diff
changeset
|
12471 |
25012 | 12472 row->ascent = max (row->ascent, it->max_ascent); |
12473 row->height = max (row->height, it->max_ascent + it->max_descent); | |
25188
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
12474 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent); |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
12475 row->phys_height = max (row->phys_height, |
6849f435f6e8
(compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents:
25098
diff
changeset
|
12476 it->max_phys_ascent + it->max_phys_descent); |
25012 | 12477 x += glyph->pixel_width; |
12478 ++i; | |
12479 } | |
12480 | |
12481 /* Stop if max_x reached. */ | |
12482 if (i < nglyphs) | |
12483 break; | |
12484 | |
12485 /* Stop at line ends. */ | |
12486 if (ITERATOR_AT_END_OF_LINE_P (it)) | |
12487 { | |
12488 it->continuation_lines_width = 0; | |
12489 break; | |
12490 } | |
12491 | |
12492 set_iterator_to_next (it); | |
12493 | |
12494 /* Stop if truncating at the right edge. */ | |
12495 if (it->truncate_lines_p | |
12496 && it->current_x >= it->last_visible_x) | |
12497 { | |
12498 /* Add truncation mark, but don't do it if the line is | |
12499 truncated at a padding space. */ | |
12500 if (IT_CHARPOS (*it) < it->string_nchars) | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12501 { |
25012 | 12502 if (!FRAME_WINDOW_P (it->f)) |
12503 produce_special_glyphs (it, IT_TRUNCATION); | |
12504 it->glyph_row->truncated_on_right_p = 1; | |
17017
667a3686a447
(display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents:
16927
diff
changeset
|
12505 } |
25012 | 12506 break; |
12507 } | |
12508 } | |
12509 | |
12510 /* Maybe insert a truncation at the left. */ | |
12511 if (it->first_visible_x | |
12512 && IT_CHARPOS (*it) > 0) | |
12513 { | |
12514 if (!FRAME_WINDOW_P (it->f)) | |
12515 insert_left_trunc_glyphs (it); | |
12516 it->glyph_row->truncated_on_left_p = 1; | |
12517 } | |
12518 | |
12519 it->face_id = saved_face_id; | |
12520 | |
12521 /* Value is number of columns displayed. */ | |
12522 return it->hpos - hpos_at_start; | |
12523 } | |
12524 | |
12525 | |
277 | 12526 |
25012 | 12527 /* This is like a combination of memq and assq. Return 1 if PROPVAL |
12528 appears as an element of LIST or as the car of an element of LIST. | |
12529 If PROPVAL is a list, compare each element against LIST in that | |
12530 way, and return 1 if any element of PROPVAL is found in LIST. | |
12531 Otherwise return 0. This function cannot quit. */ | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12532 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12533 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12534 invisible_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12535 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12536 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12537 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12538 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12539 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12540 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12541 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12542 tem = XCAR (tail); |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12543 if (EQ (propval, tem)) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12544 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12545 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12546 return 1; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12547 } |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12548 if (CONSP (propval)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12549 for (proptail = propval; CONSP (proptail); |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12550 proptail = XCDR (proptail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12551 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12552 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12553 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12554 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12555 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12556 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12557 tem = XCAR (tail); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12558 if (EQ (propelt, tem)) |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12559 return 1; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12560 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12561 return 1; |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12562 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12563 } |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12564 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12565 } |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12566 |
25012 | 12567 |
12568 /* Return 1 if PROPVAL appears as the car of an element of LIST and | |
12569 the cdr of that element is non-nil. If PROPVAL is a list, check | |
12570 each element of PROPVAL in that way, and the first time some | |
12571 element is found, return 1 if the cdr of that element is non-nil. | |
12572 Otherwise return 0. This function cannot quit. */ | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12573 |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12574 int |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12575 invisible_ellipsis_p (propval, list) |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12576 register Lisp_Object propval; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12577 Lisp_Object list; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12578 { |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12579 register Lisp_Object tail, proptail; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12580 |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12581 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12582 { |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12583 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12584 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12585 if (CONSP (tem) && EQ (propval, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12586 return ! NILP (XCDR (tem)); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12587 } |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12588 |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12589 if (CONSP (propval)) |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12590 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12591 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12592 Lisp_Object propelt; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12593 propelt = XCAR (proptail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12594 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12595 { |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12596 register Lisp_Object tem; |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12597 tem = XCAR (tail); |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12598 if (CONSP (tem) && EQ (propelt, XCAR (tem))) |
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12599 return ! NILP (XCDR (tem)); |
11066
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12600 } |
2a3d961889b4
(invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents:
11065
diff
changeset
|
12601 } |
25519
5e59e2bd26b5
Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents:
25500
diff
changeset
|
12602 |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12603 return 0; |
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12604 } |
25012 | 12605 |
12606 | |
10965
1ade2d8b0ae9
(display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents:
10911
diff
changeset
|
12607 |
25012 | 12608 /*********************************************************************** |
12609 Initialization | |
12610 ***********************************************************************/ | |
12611 | |
277 | 12612 void |
12613 syms_of_xdisp () | |
12614 { | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12615 Vwith_echo_area_save_vector = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12616 staticpro (&Vwith_echo_area_save_vector); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12617 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12618 Vmessage_stack = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12619 staticpro (&Vmessage_stack); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12620 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12621 Qinhibit_redisplay = intern ("inhibit-redisplay"); |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12622 staticpro (&Qinhibit_redisplay); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12623 |
25012 | 12624 #if GLYPH_DEBUG |
12625 defsubr (&Sdump_glyph_matrix); | |
12626 defsubr (&Sdump_glyph_row); | |
25543 | 12627 defsubr (&Sdump_tool_bar_row); |
25012 | 12628 defsubr (&Strace_redisplay_toggle); |
12629 #endif | |
12630 | |
7096
a3bf30f1a408
(syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents:
6896
diff
changeset
|
12631 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
|
12632 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
|
12633 |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
12634 staticpro (&Qoverriding_terminal_local_map); |
12267 | 12635 Qoverriding_terminal_local_map = intern ("overriding-terminal-local-map"); |
12263
6ceecf7d1ec3
(Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12171
diff
changeset
|
12636 |
12171
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
12637 staticpro (&Qoverriding_local_map); |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
12638 Qoverriding_local_map = intern ("overriding-local-map"); |
1d5d8a256d88
(update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents:
12141
diff
changeset
|
12639 |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12640 staticpro (&Qwindow_scroll_functions); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12641 Qwindow_scroll_functions = intern ("window-scroll-functions"); |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12642 |
13584
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
12643 staticpro (&Qredisplay_end_trigger_functions); |
3daf8244546e
(Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents:
13519
diff
changeset
|
12644 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions"); |
25012 | 12645 |
21748
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
12646 staticpro (&Qinhibit_point_motion_hooks); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
12647 Qinhibit_point_motion_hooks = intern ("inhibit-point-motion-hooks"); |
c423e8929f69
(Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21534
diff
changeset
|
12648 |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12649 Qdisplay = intern ("display"); |
25012 | 12650 staticpro (&Qdisplay); |
12651 Qspace_width = intern ("space-width"); | |
12652 staticpro (&Qspace_width); | |
12653 Qheight = intern ("height"); | |
12654 staticpro (&Qheight); | |
12655 Qraise = intern ("raise"); | |
12656 staticpro (&Qraise); | |
12657 Qspace = intern ("space"); | |
12658 staticpro (&Qspace); | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12659 Qmargin = intern ("margin"); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12660 staticpro (&Qmargin); |
25012 | 12661 Qleft_margin = intern ("left-margin"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12662 staticpro (&Qleft_margin); |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12663 Qright_margin = intern ("right-margin"); |
25012 | 12664 staticpro (&Qright_margin); |
12665 Qalign_to = intern ("align-to"); | |
12666 staticpro (&Qalign_to); | |
12667 QCalign_to = intern (":align-to"); | |
12668 staticpro (&QCalign_to); | |
12669 Qwidth = intern ("width"); | |
12670 staticpro (&Qwidth); | |
12671 Qrelative_width = intern ("relative-width"); | |
12672 staticpro (&Qrelative_width); | |
12673 QCrelative_width = intern (":relative-width"); | |
12674 staticpro (&QCrelative_width); | |
12675 QCrelative_height = intern (":relative-height"); | |
12676 staticpro (&QCrelative_height); | |
12677 QCeval = intern (":eval"); | |
12678 staticpro (&QCeval); | |
25614 | 12679 Qwhen = intern ("when"); |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12680 staticpro (&Qwhen); |
25677
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
12681 QCfile = intern (":file"); |
1223d6401ab2
(QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents:
25660
diff
changeset
|
12682 staticpro (&QCfile); |
25012 | 12683 Qfontified = intern ("fontified"); |
12684 staticpro (&Qfontified); | |
12685 Qfontification_functions = intern ("fontification-functions"); | |
12686 staticpro (&Qfontification_functions); | |
12687 Qtrailing_whitespace = intern ("trailing-whitespace"); | |
12688 staticpro (&Qtrailing_whitespace); | |
12689 Qimage = intern ("image"); | |
12690 staticpro (&Qimage); | |
12691 | |
25777
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12692 last_arrow_position = Qnil; |
dabc57e3628f
(compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
25755
diff
changeset
|
12693 last_arrow_string = Qnil; |
277 | 12694 staticpro (&last_arrow_position); |
12695 staticpro (&last_arrow_string); | |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12696 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12697 echo_buffer[0] = echo_buffer[1] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12698 staticpro (&echo_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12699 staticpro (&echo_buffer[1]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12700 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12701 echo_area_buffer[0] = echo_area_buffer[1] = Qnil; |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12702 staticpro (&echo_area_buffer[0]); |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12703 staticpro (&echo_area_buffer[1]); |
277 | 12704 |
25305
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12705 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace, |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12706 "Non-nil means highlight trailing whitespace.\n\ |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12707 The face used for trailing whitespace is `trailing-whitespace'."); |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12708 Vshow_trailing_whitespace = Qnil; |
273b3c17ce68
(Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
25258
diff
changeset
|
12709 |
22543
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12710 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay, |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12711 "Non-nil means don't actually do any redisplay.\n\ |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12712 This is used for internal purposes."); |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12713 Vinhibit_redisplay = Qnil; |
32cfe5058f27
(Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
22529
diff
changeset
|
12714 |
277 | 12715 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string, |
782
a6d00bdb2b60
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
781
diff
changeset
|
12716 "String (or mode line construct) included (normally) in `mode-line-format'."); |
277 | 12717 Vglobal_mode_string = Qnil; |
12718 | |
12719 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position, | |
12720 "Marker for where to display an arrow on top of the buffer text.\n\ | |
12721 This must be the beginning of a line in order to work.\n\ | |
12722 See also `overlay-arrow-string'."); | |
12723 Voverlay_arrow_position = Qnil; | |
12724 | |
12725 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string, | |
12726 "String to display as an arrow. See also `overlay-arrow-position'."); | |
12727 Voverlay_arrow_string = Qnil; | |
12728 | |
12729 DEFVAR_INT ("scroll-step", &scroll_step, | |
12730 "*The number of lines to try scrolling a window by when point moves out.\n\ | |
769 | 12731 If that fails to bring point back on frame, point is centered instead.\n\ |
12732 If this is zero, point is always centered after it moves off frame."); | |
277 | 12733 |
16527
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12734 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively, |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12735 "*Scroll up to this many lines, to bring point back on screen."); |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12736 scroll_conservatively = 0; |
2337ed73b33e
(scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16463
diff
changeset
|
12737 |
16560
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12738 DEFVAR_INT ("scroll-margin", &scroll_margin, |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12739 "*Number of lines of margin at the top and bottom of a window.\n\ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12740 Recenter the window whenever point gets within this many lines\n\ |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12741 of the top or bottom of the window."); |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12742 scroll_margin = 0; |
8b1dd6f2222d
(scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16554
diff
changeset
|
12743 |
25012 | 12744 #if GLYPH_DEBUG |
277 | 12745 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask"); |
25012 | 12746 #endif |
277 | 12747 |
12748 DEFVAR_BOOL ("truncate-partial-width-windows", | |
12749 &truncate_partial_width_windows, | |
769 | 12750 "*Non-nil means truncate lines in all windows less than full frame wide."); |
277 | 12751 truncate_partial_width_windows = 1; |
12752 | |
12753 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, | |
12754 "*Non-nil means use inverse video for the mode line."); | |
12755 mode_line_inverse_video = 1; | |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12756 |
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12757 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit, |
25012 | 12758 "*Maximum buffer size for which line number should be displayed.\n\ |
20997 | 12759 If the buffer is bigger than this, the line number does not appear\n\ |
24928
516da11f702d
(line-number-display-limit): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
24868
diff
changeset
|
12760 in the mode line."); |
2303
00e3cc81c1be
(decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents:
2252
diff
changeset
|
12761 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
|
12762 |
25258
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12763 DEFVAR_INT ("line-number-display-limit-width", &line_number_display_limit_width, |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12764 "*Maximum line width (in characters) for line number display.\n\ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12765 If the average length of the lines near point is bigger than this, then the\n\ |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12766 line number may be omitted from the mode line."); |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12767 line_number_display_limit_width = 200; |
8eefac3ecebf
(line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents:
25243
diff
changeset
|
12768 |
3265
80f57ae8d44e
(syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents:
3165
diff
changeset
|
12769 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
|
12770 "*Non-nil means highlight region even in nonselected windows."); |
17698
d9ba96fed821
(mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents:
17679
diff
changeset
|
12771 highlight_nonselected_windows = 0; |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12772 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12773 DEFVAR_BOOL ("multiple-frames", &multiple_frames, |
11767
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
12774 "Non-nil if more than one frame is visible on this display.\n\ |
4166c8ea623d
(x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents:
11761
diff
changeset
|
12775 Minibuffer-only frames don't count, but iconified frames do.\n\ |
12684
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
12776 This variable is not guaranteed to be accurate except while processing\n\ |
74e59068a948
(update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents:
12629
diff
changeset
|
12777 `frame-title-format' and `icon-title-format'."); |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12778 |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12779 DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
25012 | 12780 "Template for displaying the title bar of visible frames.\n\ |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12781 \(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
|
12782 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
|
12783 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
|
12784 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12785 DEFVAR_LISP ("icon-title-format", &Vicon_title_format, |
25012 | 12786 "Template for displaying the title bar of an iconified frame.\n\ |
8772
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12787 \(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
|
12788 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
|
12789 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
|
12790 \(see `modify-frame-parameters')."); |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12791 Vicon_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12792 = Vframe_title_format |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12793 = Fcons (intern ("multiple-frames"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12794 Fcons (build_string ("%b"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12795 Fcons (Fcons (build_string (""), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12796 Fcons (intern ("invocation-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12797 Fcons (build_string ("@"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12798 Fcons (intern ("system-name"), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12799 Qnil)))), |
c0a21329d9a7
(multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents:
8684
diff
changeset
|
12800 Qnil))); |
10393 | 12801 |
12802 DEFVAR_LISP ("message-log-max", &Vmessage_log_max, | |
12803 "Maximum number of lines to keep in the message log buffer.\n\ | |
12804 If nil, disable message logging. If t, log messages but don't truncate\n\ | |
12805 the buffer when it becomes large."); | |
12806 XSETFASTINT (Vmessage_log_max, 50); | |
10667
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12807 |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12808 DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions, |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12809 "Functions called before redisplay, if window sizes have changed.\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12810 The value should be a list of functions that take one argument.\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12811 Just before redisplay, for each frame, if any of its windows have changed\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12812 size since the last redisplay, or have been split or deleted,\n\ |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12813 all the functions in the list are called, with the frame as argument."); |
bacef13bc2ca
(Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10641
diff
changeset
|
12814 Vwindow_size_change_functions = Qnil; |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12815 |
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12816 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, |
25012 | 12817 "List of Functions to call before redisplaying a window with scrolling.\n\ |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12818 Each function is called with two arguments, the window\n\ |
13196
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
12819 and its new display-start position. Note that the value of `window-end'\n\ |
95fbb5bd0a5a
(syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13188
diff
changeset
|
12820 is not valid when these functions are called."); |
13104
ea64c261c72a
(Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12921
diff
changeset
|
12821 Vwindow_scroll_functions = Qnil; |
25012 | 12822 |
25543 | 12823 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, |
12824 "*Non-nil means automatically resize tool-bars.\n\ | |
12825 This increases a tool-bar's height if not all tool-bar items are visible.\n\ | |
12826 It decreases a tool-bar's height when it would display blank lines\n\ | |
25012 | 12827 otherwise."); |
25543 | 12828 auto_resize_tool_bars_p = 1; |
12829 | |
12830 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, | |
12831 "*Non-nil means raise tool-bar buttons when the mouse moves over them."); | |
12832 auto_raise_tool_bar_buttons_p = 1; | |
12833 | |
12834 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin, | |
12835 "*Margin around tool-bar buttons in pixels."); | |
12836 tool_bar_button_margin = 1; | |
12837 | |
12838 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief, | |
12839 "Relief thickness of tool-bar buttons."); | |
12840 tool_bar_button_relief = 3; | |
25012 | 12841 |
12842 DEFVAR_LISP ("fontification-functions", &Vfontification_functions, | |
12843 "List of functions to call to fontify regions of text.\n\ | |
12844 Each function is called with one argument POS. Functions must\n\ | |
12845 fontify a region starting at POS in the current buffer, and give\n\ | |
12846 fontified regions the property `fontified'.\n\ | |
12847 This variable automatically becomes buffer-local when set."); | |
12848 Vfontification_functions = Qnil; | |
12849 Fmake_local_variable (Qfontification_functions); | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12850 |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12851 DEFVAR_BOOL ("unibyte-display-via-language-environment", |
25012 | 12852 &unibyte_display_via_language_environment, |
12853 "*Non-nil means display unibyte text according to language environment.\n\ | |
24676
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12854 Specifically this means that unibyte non-ASCII characters\n\ |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12855 are displayed by converting them to the equivalent multibyte characters\n\ |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12856 according to the current language environment. As a result, they are\n\ |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12857 displayed according to the current fontset."); |
ba5632c9721a
(display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents:
24557
diff
changeset
|
12858 unibyte_display_via_language_environment = 0; |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12859 |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12860 DEFVAR_LISP ("max-mini-window-height", &Vmax_mini_window_height, |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12861 "*Maximum height for resizing mini-windows.\n\ |
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12862 If a float, it specifies a fraction of the mini-window frame's height.\n\ |
25403
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
12863 If an integer, it specifies a number of lines.\n\ |
5a3db5249db9
(resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents:
25394
diff
changeset
|
12864 If nil, don't resize."); |
25358
9747bbf3e480
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25316
diff
changeset
|
12865 Vmax_mini_window_height = make_float (0.25); |
277 | 12866 } |
12867 | |
25012 | 12868 |
12869 /* Initialize this module when Emacs starts. */ | |
12870 | |
21514 | 12871 void |
277 | 12872 init_xdisp () |
12873 { | |
12874 Lisp_Object root_window; | |
25012 | 12875 struct window *mini_w; |
12876 | |
12877 CHARPOS (this_line_start_pos) = 0; | |
277 | 12878 |
12879 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
|
12880 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
277 | 12881 |
12882 if (!noninteractive) | |
12883 { | |
25012 | 12884 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window))); |
12885 int i; | |
12886 | |
12887 XSETFASTINT (XWINDOW (root_window)->top, FRAME_TOP_MARGIN (f)); | |
18458
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
12888 set_window_height (root_window, |
25012 | 12889 FRAME_HEIGHT (f) - 1 - FRAME_TOP_MARGIN (f), |
18458
96905485f262
(init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
18184
diff
changeset
|
12890 0); |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12891 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1); |
277 | 12892 set_window_height (minibuf_window, 1, 0); |
12893 | |
9325
6f07f6dfe1ee
(redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents:
9283
diff
changeset
|
12894 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
|
12895 XSETFASTINT (mini_w->width, FRAME_WIDTH (f)); |
25012 | 12896 |
12897 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs; | |
12898 scratch_glyph_row.glyphs[TEXT_AREA + 1] | |
12899 = scratch_glyphs + MAX_SCRATCH_GLYPHS; | |
12900 | |
12901 /* The default ellipsis glyphs `...'. */ | |
12902 for (i = 0; i < 3; ++i) | |
12903 XSETFASTINT (default_invis_vector[i], '.'); | |
12904 } | |
12905 | |
12906 #ifdef HAVE_WINDOW_SYSTEM | |
12907 { | |
12908 /* Allocate the buffer for frame titles. */ | |
12909 int size = 100; | |
12910 frame_title_buf = (char *) xmalloc (size); | |
12911 frame_title_buf_end = frame_title_buf + size; | |
12912 frame_title_ptr = NULL; | |
12913 } | |
12914 #endif /* HAVE_WINDOW_SYSTEM */ | |
12915 } | |
12916 | |
12917 |